ember-source 2.16.3 → 2.17.0.beta.4

data/dist/ember.prod.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.16.3
+ * @version   2.17.0-beta.4
  */
 
 var enifed, requireModule, Ember;
@@ -5307,15 +5307,14 @@ enifed('@glimmer/runtime', ['exports', '@glimmer/util', '@glimmer/reference', '@
                 value;
             var partialSymbols = partial.symbolTable.symbols;
             var outerScope = vm.scope();
-            var evalScope = outerScope.getEvalScope();
             var partialScope = vm.pushRootScope(partialSymbols.length, false);
             partialScope.bindCallerScope(outerScope.getCallerScope());
-            partialScope.bindEvalScope(evalScope);
+            partialScope.bindEvalScope(outerScope.getEvalScope());
             partialScope.bindSelf(outerScope.getSelf());
             var evalInfo = this.evalInfo,
                 outerSymbols = this.outerSymbols;
 
-            var locals = Object.create(outerScope.getPartialMap());
+            var locals = (0, _util.dict)();
             for (i = 0; i < evalInfo.length; i++) {
                 slot = evalInfo[i];
                 name = outerSymbols[slot - 1];
@@ -5323,14 +5322,13 @@ enifed('@glimmer/runtime', ['exports', '@glimmer/util', '@glimmer/reference', '@
 
                 locals[name] = ref;
             }
-            if (evalScope) {
-                for (_i2 = 0; _i2 < partialSymbols.length; _i2++) {
-                    _name = partialSymbols[_i2];
-                    symbol = _i2 + 1;
-                    value = evalScope[_name];
+            var evalScope = outerScope.getEvalScope();
+            for (_i2 = 0; _i2 < partialSymbols.length; _i2++) {
+                _name = partialSymbols[_i2];
+                symbol = _i2 + 1;
+                value = evalScope[_name];
 
-                    if (value !== undefined) partialScope.bind(symbol, value);
-                }
+                if (value !== undefined) partialScope.bind(symbol, value);
             }
             partialScope.bindPartialMap(locals);
             vm.pushFrame();
@@ -10451,10 +10449,10 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
       this.isDestroyed = true;
     },
     reset: function (fullName) {
-      if (fullName !== undefined) {
-        resetMember(this, this.registry.normalize(fullName));
-      } else {
+      if (fullName === undefined) {
         resetCache(this);
+      } else {
+        resetMember(this, this.registry.normalize(fullName));
       }
     },
     ownerInjection: function () {
@@ -10520,7 +10518,9 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
 
   function lookup(container, fullName) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-        expandedFullName;
+        expandedFullName,
+        cacheKey,
+        cached;
 
     if (options.source) {
       expandedFullName = container.registry.expandLocalLookup(fullName, options);
@@ -10533,10 +10533,13 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
       fullName = expandedFullName;
     }
 
-    var cacheKey = container._resolverCacheKey(fullName, options);
-    var cached = container.cache[cacheKey];
-    if (cached !== undefined && options.singleton !== false) {
-      return cached;
+    if (options.singleton !== false) {
+      cacheKey = container._resolverCacheKey(fullName, options);
+      cached = container.cache[cacheKey];
+
+      if (cached !== undefined) {
+        return cached;
+      }
     }
 
     return instantiateFactory(container, fullName, options);
@@ -10571,17 +10574,18 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
   }
 
   function instantiateFactory(container, fullName, options) {
-    var factoryManager = container.factoryFor(fullName);
+    var factoryManager = container.factoryFor(fullName),
+        cacheKey;
 
     if (factoryManager === undefined) {
       return;
     }
 
-    var cacheKey = container._resolverCacheKey(fullName, options);
-
     // SomeClass { singleton: true, instantiate: true } | { singleton: true } | { instantiate: true } | {}
     // By default majority of objects fall into this case
     if (isSingletonInstance(container, fullName, options)) {
+      cacheKey = container._resolverCacheKey(fullName, options);
+
       return container.cache[cacheKey] = factoryManager.create();
     }
 
@@ -10598,22 +10602,14 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     throw new Error('Could not create factory');
   }
 
-  function markInjectionsAsDynamic(injections) {
-    injections._dynamic = true;
-  }
-
-  function areInjectionsNotDynamic(injections) {
-    return injections._dynamic !== true;
-  }
-
   function buildInjections() /* container, ...injections */{
     var hash = {},
         container,
         injections,
         injection,
         i,
-        markAsDynamic,
         _i;
+    var isDynamic = false;
 
     if (arguments.length > 1) {
       container = arguments[0];
@@ -10627,22 +10623,16 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
         }
       }
 
-      markAsDynamic = false;
-
       for (_i = 0; _i < injections.length; _i++) {
         injection = injections[_i];
         hash[injection.property] = lookup(container, injection.fullName);
-        if (!markAsDynamic) {
-          markAsDynamic = !isSingleton(container, injection.fullName);
+        if (!isDynamic) {
+          isDynamic = !isSingleton(container, injection.fullName);
         }
       }
-
-      if (markAsDynamic) {
-        markInjectionsAsDynamic(hash);
-      }
     }
 
-    return hash;
+    return { injections: hash, isDynamic: isDynamic };
   }
 
   function injectionsFor(container, fullName) {
@@ -10650,9 +10640,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     var splitName = fullName.split(':');
     var type = splitName[0];
 
-    var injections = buildInjections(container, registry.getTypeInjections(type), registry.getInjections(fullName));
-
-    return injections;
+    return buildInjections(container, registry.getTypeInjections(type), registry.getInjections(fullName));
   }
 
   function destroyDestroyables(container) {
@@ -10667,7 +10655,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
       value = cache[key];
 
 
-      if (isInstantiatable(container, key) && value.destroy) {
+      if (value.destroy) {
         value.destroy();
       }
     }
@@ -10675,7 +10663,8 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
 
   function resetCache(container) {
     destroyDestroyables(container);
-    container.cache.dict = (0, _emberUtils.dictionary)(null);
+    container.cache = (0, _emberUtils.dictionary)(null);
+    container.factoryManagerCache = (0, _emberUtils.dictionary)(null);
   }
 
   function resetMember(container, fullName) {
@@ -10705,7 +10694,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     }
 
     FactoryManager.prototype.toString = function () {
-      if (!this.madeToString) {
+      if (this.madeToString === undefined) {
         this.madeToString = this.container.registry.makeToString(this.class, this.fullName);
       }
 
@@ -10713,16 +10702,23 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     };
 
     FactoryManager.prototype.create = function () {
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _injectionsFor,
+          injections,
+          isDynamic;
+
+      var injectionsCache = this.injections;
+      if (injectionsCache === undefined) {
+        _injectionsFor = injectionsFor(this.container, this.normalizedName), injections = _injectionsFor.injections, isDynamic = _injectionsFor.isDynamic;
 
-      var injections = this.injections;
-      if (injections === undefined) {
-        injections = injectionsFor(this.container, this.normalizedName);
-        if (areInjectionsNotDynamic(injections)) {
+
+        injectionsCache = injections;
+        if (!isDynamic) {
           this.injections = injections;
         }
       }
-      var props = (0, _emberUtils.assign)({}, injections, options);
+
+      var props = (0, _emberUtils.assign)({}, injectionsCache, options);
 
       if (!this.class.create) {
         throw new Error('Failed to create an instance of \'' + this.normalizedName + '\'. Most likely an improperly defined class or' + ' an invalid module export.');
@@ -10990,10 +10986,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
 
       var injections = this._typeInjections[type] || (this._typeInjections[type] = []);
 
-      injections.push({
-        property: property,
-        fullName: fullName
-      });
+      injections.push({ property: property, fullName: fullName });
     },
     injection: function (fullName, property, injectionName) {
       this.validateFullName(injectionName);
@@ -11009,10 +11002,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
 
       var injections = this._injections[normalizedName] || (this._injections[normalizedName] = []);
 
-      injections.push({
-        property: property,
-        fullName: normalizedInjectionName
-      });
+      injections.push({ property: property, fullName: normalizedInjectionName });
     },
     knownForType: function (type) {
       var fallbackKnown = void 0,
@@ -11053,22 +11043,6 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     isValidFullName: function (fullName) {
       return VALID_FULL_NAME_REGEXP.test(fullName);
     },
-    normalizeInjectionsHash: function (hash) {
-      var injections = [];
-
-      for (var key in hash) {
-        if (hash.hasOwnProperty(key)) {
-          false && !this.validateFullName(hash[key]) && (0, _emberDebug.assert)('Expected a proper full name, given \'' + hash[key] + '\'', this.validateFullName(hash[key]));
-
-          injections.push({
-            property: key,
-            fullName: hash[key]
-          });
-        }
-      }
-
-      return injections;
-    },
     getInjections: function (fullName) {
       var injections = this._injections[fullName] || [];
       if (this.fallback) {
@@ -11085,6 +11059,25 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     },
     resolverCacheKey: function (name, options) {
       return name;
+    },
+    expandLocalLookup: function (fullName, options) {
+      var normalizedFullName, normalizedSource;
+
+      if (this.resolver && this.resolver.expandLocalLookup) {
+        false && !this.validateFullName(fullName) && (0, _emberDebug.assert)('fullName must be a proper full name', this.validateFullName(fullName));
+        false && !(options && options.source) && (0, _emberDebug.assert)('options.source must be provided to expandLocalLookup', options && options.source);
+        false && !this.validateFullName(options.source) && (0, _emberDebug.assert)('options.source must be a proper full name', this.validateFullName(options.source));
+
+        normalizedFullName = this.normalize(fullName);
+        normalizedSource = this.normalize(options.source);
+
+
+        return expandLocalLookup(this, normalizedFullName, normalizedSource);
+      } else if (this.fallback) {
+        return this.fallback.expandLocalLookup(fullName, options);
+      } else {
+        return null;
+      }
     }
   };
 
@@ -11096,44 +11089,6 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug'], function (exports
     };
   }
 
-  /**
-   Given a fullName and a source fullName returns the fully resolved
-   fullName. Used to allow for local lookup.
-  
-   ```javascript
-   let registry = new Registry();
-  
-   // the twitter factory is added to the module system
-   registry.expandLocalLookup('component:post-title', { source: 'template:post' }) // => component:post/post-title
-   ```
-  
-   @private
-   @method expandLocalLookup
-   @param {String} fullName
-   @param {Object} [options]
-   @param {String} [options.source] the fullname of the request source (used for local lookups)
-   @return {String} fullName
-   */
-  Registry.prototype.expandLocalLookup = function (fullName, options) {
-    var normalizedFullName, normalizedSource;
-
-    if (this.resolver && this.resolver.expandLocalLookup) {
-      false && !this.validateFullName(fullName) && (0, _emberDebug.assert)('fullName must be a proper full name', this.validateFullName(fullName));
-      false && !(options && options.source) && (0, _emberDebug.assert)('options.source must be provided to expandLocalLookup', options && options.source);
-      false && !this.validateFullName(options.source) && (0, _emberDebug.assert)('options.source must be a proper full name', this.validateFullName(options.source));
-
-      normalizedFullName = this.normalize(fullName);
-      normalizedSource = this.normalize(options.source);
-
-
-      return expandLocalLookup(this, normalizedFullName, normalizedSource);
-    } else if (this.fallback) {
-      return this.fallback.expandLocalLookup(fullName, options);
-    } else {
-      return null;
-    }
-  };
-
   function expandLocalLookup(registry, normalizedName, normalizedSource) {
     var cache = registry._localLookupCache;
     var normalizedNameCache = cache[normalizedName];
@@ -11523,11 +11478,9 @@ enifed('ember-application/initializers/dom-templates', ['require', 'ember-glimme
     }
   });
 });
-enifed('ember-application/system/application-instance', ['exports', 'ember-utils', 'ember-debug', 'ember-metal', 'ember-runtime', 'ember-environment', 'ember-views', 'ember-application/system/engine-instance'], function (exports, _emberUtils, _emberDebug, _emberMetal, _emberRuntime, _emberEnvironment, _emberViews, _engineInstance) {
+enifed('ember-application/system/application-instance', ['exports', 'ember-utils', 'ember-metal', 'ember-runtime', 'ember-environment', 'ember-views', 'ember-application/system/engine-instance'], function (exports, _emberUtils, _emberMetal, _emberRuntime, _emberEnvironment, _emberViews, _engineInstance) {
   'use strict';
 
-  var BootOptions = void 0;
-
   /**
     The `ApplicationInstance` encapsulates all of the stateful aspects of a
     running `Application`.
@@ -11672,8 +11625,7 @@ enifed('ember-application/system/application-instance', ['exports', 'ember-utils
       return dispatcher;
     },
     getURL: function () {
-      var router = (0, _emberMetal.get)(this, 'router');
-      return (0, _emberMetal.get)(router, 'url');
+      return (0, _emberMetal.get)(this, 'router.url');
     },
     visit: function (url) {
       var _this = this;
@@ -11759,7 +11711,7 @@ enifed('ember-application/system/application-instance', ['exports', 'ember-utils
     @namespace ApplicationInstance
     @public
   */
-  BootOptions = function () {
+  function BootOptions() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
     /**
@@ -11901,7 +11853,7 @@ enifed('ember-application/system/application-instance', ['exports', 'ember-utils
     if (options.isInteractive !== undefined) {
       this.isInteractive = !!options.isInteractive;
     }
-  };
+  }
 
   BootOptions.prototype.toEnvironment = function () {
     var env = (0, _emberUtils.assign)({}, _emberEnvironment.environment);
@@ -12303,7 +12255,7 @@ enifed('ember-application/system/application', ['exports', 'ember-babel', 'ember
       // boot promise exists for book-keeping purposes: if anything went wrong in
       // the boot process, we need to store the error as a rejection on the boot
       // promise so that a future caller of `boot()` can tell what failed.
-      var defer = this._bootResolver = new _emberRuntime.RSVP.defer();
+      var defer = this._bootResolver = _emberRuntime.RSVP.defer();
       this._bootPromise = defer.promise;
 
       try {
@@ -16384,7 +16336,7 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-console', 'ember-d
       }
     }),
 
-    _computeActive: function (routerState) {
+    _isActive: function (routerState) {
       if ((0, _emberMetal.get)(this, 'loading')) {
         return false;
       }
@@ -16405,7 +16357,7 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-console', 'ember-d
 
       for (i = 0; i < currentWhen.length; i++) {
         if (routing.isActiveForRoute(models, resolvedQueryParams, currentWhen[i], routerState, isCurrentWhenSpecified)) {
-          return (0, _emberMetal.get)(this, 'activeClass');
+          return true;
         }
       }
 
@@ -16423,13 +16375,21 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-console', 'ember-d
        @property active
       @private
     */
-    active: (0, _emberMetal.computed)('attrs.params', '_routing.currentState', function () {
+    active: (0, _emberMetal.computed)('attrs.params', '_active', function () {
       var currentState = (0, _emberMetal.get)(this, '_routing.currentState');
       if (!currentState) {
         return false;
       }
 
-      return this._computeActive(currentState);
+      return this.get('_active') ? (0, _emberMetal.get)(this, 'activeClass') : false;
+    }),
+
+    _active: (0, _emberMetal.computed)('_routing.currentState', function () {
+      var currentState = (0, _emberMetal.get)(this, '_routing.currentState');
+      if (!currentState) {
+        return false;
+      }
+      return this._isActive(currentState);
     }),
 
     willBeActive: (0, _emberMetal.computed)('_routing.targetState', function () {
@@ -16439,11 +16399,11 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-console', 'ember-d
         return;
       }
 
-      return !!this._computeActive(targetState);
+      return this._isActive(targetState);
     }),
 
     transitioningIn: (0, _emberMetal.computed)('active', 'willBeActive', function () {
-      if ((0, _emberMetal.get)(this, 'willBeActive') === true && !(0, _emberMetal.get)(this, 'active')) {
+      if ((0, _emberMetal.get)(this, 'willBeActive') === true && !(0, _emberMetal.get)(this, '_active')) {
         return 'ember-transitioning-in';
       } else {
         return false;
@@ -16451,7 +16411,7 @@ enifed('ember-glimmer/components/link-to', ['exports', 'ember-console', 'ember-d
     }),
 
     transitioningOut: (0, _emberMetal.computed)('active', 'willBeActive', function () {
-      if ((0, _emberMetal.get)(this, 'willBeActive') === false && (0, _emberMetal.get)(this, 'active')) {
+      if ((0, _emberMetal.get)(this, 'willBeActive') === false && (0, _emberMetal.get)(this, '_active')) {
         return 'ember-transitioning-out';
       } else {
         return false;
@@ -18314,7 +18274,7 @@ enifed('ember-glimmer/helpers/each-in', ['exports', 'ember-utils'], function (ex
   */
   var EACH_IN_REFERENCE = (0, _emberUtils.symbol)('EACH_IN');
 });
-enifed('ember-glimmer/helpers/get', ['exports', 'ember-babel', 'ember-metal', 'ember-glimmer/utils/references', '@glimmer/reference'], function (exports, _emberBabel, _emberMetal, _references, _reference) {
+enifed('ember-glimmer/helpers/get', ['exports', 'ember-babel', 'ember-metal', 'ember-glimmer/utils/references', '@glimmer/reference', '@glimmer/runtime'], function (exports, _emberBabel, _emberMetal, _references, _reference, _runtime) {
   'use strict';
 
   exports.default = function (vm, args) {
@@ -18344,7 +18304,7 @@ enifed('ember-glimmer/helpers/get', ['exports', 'ember-babel', 'ember-metal', 'e
       _this.pathReference = pathReference;
 
       _this.lastPath = null;
-      _this.innerReference = null;
+      _this.innerReference = _runtime.NULL_REFERENCE;
 
       var innerTag = _this.innerTag = new _reference.UpdatableTag(_reference.CONSTANT_TAG);
 
@@ -18366,19 +18326,21 @@ enifed('ember-glimmer/helpers/get', ['exports', 'ember-babel', 'ember-metal', 'e
 
 
           if (pathType === 'string') {
-            innerReference = this.innerReference = (0, _reference.referenceFromParts)(this.sourceReference, path.split('.'));
+            innerReference = (0, _reference.referenceFromParts)(this.sourceReference, path.split('.'));
           } else if (pathType === 'number') {
-            innerReference = this.innerReference = this.sourceReference.get('' + path);
+            innerReference = this.sourceReference.get('' + path);
           }
 
           innerTag.update(innerReference.tag);
         } else {
-          innerReference = this.innerReference = null;
+          innerReference = _runtime.NULL_REFERENCE;
           innerTag.update(_reference.CONSTANT_TAG);
         }
+
+        this.innerReference = innerReference;
       }
 
-      return innerReference ? innerReference.value() : null;
+      return innerReference.value();
     };
 
     GetHelperReference.prototype[_references.UPDATE] = function (value) {
@@ -19677,9 +19639,6 @@ enifed('ember-glimmer/renderer', ['exports', 'ember-babel', 'ember-glimmer/utils
       } finally {
         if (!completedWithoutError) {
           this._lastRevision = _reference.CURRENT_TAG.value();
-          if (this._env.inTransaction === true) {
-            this._env.commit();
-          }
         }
         this._isRenderingRoots = false;
       }
@@ -20130,8 +20089,7 @@ enifed('ember-glimmer/syntax/input', ['exports', 'ember-debug', 'ember-glimmer/u
 
   function (name, params, hash, builder) {
     var keys = void 0,
-        typeArg,
-        definition;
+        typeArg;
     var values = void 0;
     var typeIndex = -1;
     var valueIndex = -1;
@@ -20150,31 +20108,23 @@ enifed('ember-glimmer/syntax/input', ['exports', 'ember-debug', 'ember-glimmer/u
     if (typeIndex > -1) {
       typeArg = values[typeIndex];
 
-      if (!Array.isArray(typeArg)) {
-        if (typeArg === 'checkbox') {
-          false && !(valueIndex === -1) && (0, _emberDebug.assert)('{{input type=\'checkbox\'}} does not support setting `value=someBooleanValue`; ' + 'you must use `checked=someBooleanValue` instead.', valueIndex === -1);
-
-          (0, _bindings.wrapComponentClassAttribute)(hash);
+      if (Array.isArray(typeArg)) {
+        return (0, _dynamicComponent.dynamicComponentMacro)(params, hash, null, null, builder);
+      } else if (typeArg === 'checkbox') {
+        false && !(valueIndex === -1) && (0, _emberDebug.assert)('{{input type=\'checkbox\'}} does not support setting `value=someBooleanValue`; ' + 'you must use `checked=someBooleanValue` instead.', valueIndex === -1);
 
-          definition = builder.env.getComponentDefinition('-checkbox', builder.meta.templateMeta);
-
-          builder.component.static(definition, [params, (0, _utils.hashToArgs)(hash), null, null]);
-          return true;
-        } else {
-          return buildTextFieldSyntax(params, hash, builder);
-        }
+        (0, _bindings.wrapComponentClassAttribute)(hash);
+        return buildSyntax('-checkbox', params, hash, builder);
       }
-    } else {
-      return buildTextFieldSyntax(params, hash, builder);
     }
 
-    return (0, _dynamicComponent.dynamicComponentMacro)(params, hash, null, null, builder);
+    return buildSyntax('-text-field', params, hash, builder);
   };
   /**
   @module ember
   */
-  function buildTextFieldSyntax(params, hash, builder) {
-    var definition = builder.env.getComponentDefinition('-text-field', builder.meta.templateMeta);
+  function buildSyntax(type, params, hash, builder) {
+    var definition = builder.env.getComponentDefinition(type, builder.meta.templateMeta);
     builder.component.static(definition, [params, (0, _utils.hashToArgs)(hash), null, null]);
     return true;
   }
@@ -21060,7 +21010,6 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-babel', 'ember-utils',
       var _this2 = (0, _emberBabel.possibleConstructorReturn)(this, _ArrayIterator2.call(this, values, keyFor));
 
       _this2.keys = keys;
-      _this2.length = keys.length;
       return _this2;
     }
 
@@ -21068,10 +21017,6 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-babel', 'ember-utils',
       return this.keys[position];
     };
 
-    ObjectKeysIterator.prototype.getValue = function (position) {
-      return this.array[position];
-    };
-
     return ObjectKeysIterator;
   }(ArrayIterator);
 
@@ -21119,7 +21064,7 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-babel', 'ember-utils',
 
       var typeofIterable = typeof iterable;
 
-      if (iterable && (typeofIterable === 'object' || typeofIterable === 'function')) {
+      if (iterable !== null && (typeofIterable === 'object' || typeofIterable === 'function')) {
         keys = Object.keys(iterable);
         values = keys.map(function (key) {
           return iterable[key];
@@ -21171,7 +21116,7 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-babel', 'ember-utils',
 
       valueTag.update((0, _emberMetal.tagForProperty)(iterable, '[]'));
 
-      if (!iterable || typeof iterable !== 'object') {
+      if (iterable === null || typeof iterable !== 'object') {
         return EMPTY_ITERATOR;
       }
 
@@ -21531,19 +21476,19 @@ enifed('ember-glimmer/utils/references', ['exports', 'ember-babel', 'ember-utils
     (0, _emberBabel.inherits)(SimpleHelperReference, _CachedReference2);
 
     SimpleHelperReference.create = function (helper, args) {
-      var positional, named, positionalValue, namedValue, _result;
+      var positional, named, positionalValue, namedValue, result;
 
       if ((0, _reference.isConst)(args)) {
         positional = args.positional, named = args.named;
         positionalValue = positional.value();
         namedValue = named.value();
-        _result = helper(positionalValue, namedValue);
+        result = helper(positionalValue, namedValue);
 
 
-        if (typeof _result === 'object' && _result !== null || typeof _result === 'function') {
-          return new RootReference(_result);
+        if (typeof result === 'object' && result !== null || typeof result === 'function') {
+          return new RootReference(result);
         } else {
-          return _runtime.PrimitiveReference.create(_result);
+          return _runtime.PrimitiveReference.create(result);
         }
       } else {
         return new SimpleHelperReference(helper, args);
@@ -21640,7 +21585,7 @@ enifed('ember-glimmer/utils/references', ['exports', 'ember-babel', 'ember-utils
     }
 
     UnboundReference.create = function (value) {
-      if (typeof value === 'object' && value !== null || typeof result === 'function') {
+      if (typeof value === 'object' && value !== null) {
         return new UnboundReference(value);
       } else {
         return _runtime.PrimitiveReference.create(value);
@@ -22338,7 +22283,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     var meta$$1, i, target, method, flags;
 
     if (actions === undefined) {
-      meta$$1 = _meta || exports.peekMeta(obj);
+      meta$$1 = _meta === undefined ? exports.peekMeta(obj) : _meta;
 
       actions = typeof meta$$1 === 'object' && meta$$1 !== null && meta$$1.matchingListeners(eventName);
     }
@@ -22407,9 +22352,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
         target,
         method;
     var meta$$1 = exports.peekMeta(obj);
-    var actions = meta$$1 && meta$$1.matchingListeners(eventName);
+    var actions = meta$$1 !== undefined ? meta$$1.matchingListeners(eventName) : undefined;
 
-    if (!actions) {
+    if (actions === undefined) {
       return ret;
     }
 
@@ -22466,7 +22411,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     var meta$$1;
 
     if (typeof object === 'object' && object !== null) {
-      meta$$1 = _meta || meta(object);
+      meta$$1 = _meta === undefined ? meta(object) : _meta;
 
       return meta$$1.writableTag(makeTag);
     } else {
@@ -22625,12 +22570,12 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @private
   */
   function propertyWillChange(obj, keyName, _meta) {
-    var meta$$1 = _meta || exports.peekMeta(obj);
-    if (meta$$1 && !meta$$1.isInitialized(obj)) {
+    var meta$$1 = _meta === undefined ? exports.peekMeta(obj) : _meta;
+    if (meta$$1 !== undefined && !meta$$1.isInitialized(obj)) {
       return;
     }
 
-    var watching = meta$$1 && meta$$1.peekWatching(keyName) > 0;
+    var watching = meta$$1 !== undefined && meta$$1.peekWatching(keyName) > 0;
     var possibleDesc = obj[keyName];
     var isDescriptor = possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor;
 
@@ -22663,8 +22608,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @private
   */
   function propertyDidChange(obj, keyName, _meta) {
-    var meta$$1 = _meta || exports.peekMeta(obj);
-    var hasMeta = !!meta$$1;
+    var meta$$1 = _meta === undefined ? exports.peekMeta(obj) : _meta;
+    var hasMeta = meta$$1 !== undefined;
 
     if (hasMeta && !meta$$1.isInitialized(obj)) {
       return;
@@ -23065,16 +23010,16 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
   }
 
-  function watchKey(obj, keyName, meta$$1) {
+  function watchKey(obj, keyName, _meta) {
     if (typeof obj !== 'object' || obj === null) {
       return;
     }
 
-    var m = meta$$1 || meta(obj),
+    var meta$$1 = _meta === undefined ? meta(obj) : _meta,
         possibleDesc,
         isDescriptor;
-    var count = m.peekWatching(keyName) || 0;
-    m.writeWatching(keyName, count + 1);
+    var count = meta$$1.peekWatching(keyName) || 0;
+    meta$$1.writeWatching(keyName, count + 1);
 
     if (count === 0) {
       // activate watching first time
@@ -23082,10 +23027,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       isDescriptor = possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor;
 
       if (isDescriptor && possibleDesc.willWatch) {
-        possibleDesc.willWatch(obj, keyName);
+        possibleDesc.willWatch(obj, keyName, meta$$1);
       }
 
-      if ('function' === typeof obj.willWatchProperty) {
+      if (typeof obj.willWatchProperty === 'function') {
         obj.willWatchProperty(keyName);
       }
     }
@@ -23095,7 +23040,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     if (typeof obj !== 'object' || obj === null) {
       return;
     }
-    var meta$$1 = _meta || exports.peekMeta(obj),
+    var meta$$1 = _meta === undefined ? exports.peekMeta(obj) : _meta,
         possibleDesc,
         isDescriptor;
 
@@ -23113,10 +23058,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
 
       if (isDescriptor && possibleDesc.didUnwatch) {
-        possibleDesc.didUnwatch(obj, keyName);
+        possibleDesc.didUnwatch(obj, keyName, meta$$1);
       }
 
-      if ('function' === typeof obj.didUnwatchProperty) {
+      if (typeof obj.didUnwatchProperty === 'function') {
         obj.didUnwatchProperty(keyName);
       }
     } else if (count > 1) {
@@ -23132,7 +23077,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     if (typeof obj !== 'object' || obj === null) {
       return;
     }
-    var m = meta$$1 || meta(obj);
+    var m = meta$$1 === undefined ? meta(obj) : meta$$1;
     var counter = m.peekWatching(keyPath) || 0;
 
     m.writeWatching(keyPath, counter + 1);
@@ -23146,7 +23091,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     if (typeof obj !== 'object' || obj === null) {
       return;
     }
-    var m = meta$$1 || exports.peekMeta(obj);
+    var m = meta$$1 === undefined ? exports.peekMeta(obj) : meta$$1;
+
     if (m === undefined) {
       return;
     }
@@ -24031,6 +23977,18 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     };
   }
 
+  /**
+    Tears down the meta on an object so that it can be garbage collected.
+    Multiple calls will have no effect.
+  
+    @method deleteMeta
+    @for Ember
+    @param {Object} obj  the object to destroy
+    @return {void}
+    @private
+  */
+
+
   /**
     Retrieves the meta hash for an object. If `writable` is true ensures the
     hash is writable for this object as well.
@@ -24481,7 +24439,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
   function watcherCount(obj, key) {
     var meta$$1 = exports.peekMeta(obj);
-    return meta$$1 && meta$$1.peekWatching(key) || 0;
+    return meta$$1 !== undefined && meta$$1.peekWatching(key) || 0;
   }
 
   function unwatch(obj, _keyPath, m) {
@@ -25082,8 +25040,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   */
   function cacheFor(obj, key) {
     var meta$$1 = exports.peekMeta(obj);
-    var cache = meta$$1 && meta$$1.source === obj && meta$$1.readableCache();
-    var ret = cache && cache[key];
+    var cache = meta$$1 !== undefined ? meta$$1.source === obj && meta$$1.readableCache() : undefined;
+    var ret = cache !== undefined ? cache[key] : undefined;
 
     if (ret === UNDEFINED) {
       return undefined;
@@ -25136,17 +25094,17 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     };
 
     AliasedProperty.prototype.teardown = function (obj, keyName, meta$$1) {
-      if (meta$$1 && meta$$1.peekWatching(keyName)) {
+      if (meta$$1.peekWatching(keyName)) {
         removeDependentKeys(this, obj, keyName, meta$$1);
       }
     };
 
-    AliasedProperty.prototype.willWatch = function (obj, keyName) {
-      addDependentKeys(this, obj, keyName, meta(obj));
+    AliasedProperty.prototype.willWatch = function (obj, keyName, meta$$1) {
+      addDependentKeys(this, obj, keyName, meta$$1);
     };
 
-    AliasedProperty.prototype.didUnwatch = function (obj, keyName) {
-      removeDependentKeys(this, obj, keyName, meta(obj));
+    AliasedProperty.prototype.didUnwatch = function (obj, keyName, meta$$1) {
+      removeDependentKeys(this, obj, keyName, meta$$1);
     };
 
     AliasedProperty.prototype.get = function (obj, keyName) {
@@ -26604,13 +26562,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     Map is mocked out to look like an Ember object, so you can do
     `EmberMap.create()` for symmetry with other Ember classes.
   */
-  function missingFunction(fn) {
-    throw new TypeError(Object.prototype.toString.call(fn) + ' is not a function');
-  }
-
-  function missingNew(name) {
-    throw new TypeError('Constructor ' + name + ' requires \'new\'');
-  }
 
   function copyNull(obj) {
     var output = Object.create(null);
@@ -26644,37 +26595,35 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @constructor
     @private
   */
-  function OrderedSet() {
-    if (this instanceof OrderedSet) {
+
+  var OrderedSet = function () {
+    function OrderedSet() {
+
       this.clear();
-    } else {
-      missingNew('OrderedSet');
     }
-  }
 
-  /**
-    @method create
-    @static
-    @return {Ember.OrderedSet}
-    @private
-  */
-  OrderedSet.create = function () {
-    var Constructor = this;
+    /**
+      @method create
+      @static
+      @return {Ember.OrderedSet}
+      @private
+    */
 
-    return new Constructor();
-  };
+    OrderedSet.create = function () {
+      var Constructor = this;
+      return new Constructor();
+    };
 
-  OrderedSet.prototype = {
-    constructor: OrderedSet,
     /**
       @method clear
       @private
     */
-    clear: function () {
+
+    OrderedSet.prototype.clear = function () {
       this.presenceSet = Object.create(null);
       this.list = [];
       this.size = 0;
-    },
+    };
 
     /**
       @method add
@@ -26683,7 +26632,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {Ember.OrderedSet}
       @private
     */
-    add: function (obj, _guid) {
+
+    OrderedSet.prototype.add = function (obj, _guid) {
       var guid = _guid || emberUtils.guidFor(obj);
       var presenceSet = this.presenceSet;
       var list = this.list;
@@ -26694,7 +26644,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       }
 
       return this;
-    },
+    };
 
     /**
       @since 1.8.0
@@ -26704,7 +26654,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {Boolean}
       @private
     */
-    delete: function (obj, _guid) {
+
+    OrderedSet.prototype.delete = function (obj, _guid) {
       var guid = _guid || emberUtils.guidFor(obj),
           index;
       var presenceSet = this.presenceSet;
@@ -26722,16 +26673,17 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       } else {
         return false;
       }
-    },
+    };
 
     /**
       @method isEmpty
       @return {Boolean}
       @private
     */
-    isEmpty: function () {
+
+    OrderedSet.prototype.isEmpty = function () {
       return this.size === 0;
-    },
+    };
 
     /**
       @method has
@@ -26739,7 +26691,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {Boolean}
       @private
     */
-    has: function (obj) {
+
+    OrderedSet.prototype.has = function (obj) {
       if (this.size === 0) {
         return false;
       }
@@ -26748,7 +26701,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       var presenceSet = this.presenceSet;
 
       return presenceSet[guid] === true;
-    },
+    };
 
     /**
       @method forEach
@@ -26756,10 +26709,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @param self
       @private
     */
-    forEach: function (fn /*, ...thisArg*/) {
-      if (typeof fn !== 'function') {
-        missingFunction(fn);
-      }
+
+    OrderedSet.prototype.forEach = function (fn /*, ...thisArg*/) {
+      false && !(typeof fn === 'function') && emberDebug.assert(Object.prototype.toString.call(fn) + ' is not a function', typeof fn === 'function');
 
       if (this.size === 0) {
         return;
@@ -26778,23 +26730,25 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
           fn(list[_i]);
         }
       }
-    },
+    };
 
     /**
       @method toArray
       @return {Array}
       @private
     */
-    toArray: function () {
+
+    OrderedSet.prototype.toArray = function () {
       return this.list.slice();
-    },
+    };
 
     /**
       @method copy
       @return {Ember.OrderedSet}
       @private
     */
-    copy: function () {
+
+    OrderedSet.prototype.copy = function () {
       var Constructor = this.constructor;
       var set = new Constructor();
 
@@ -26803,8 +26757,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       set.size = this.size;
 
       return set;
-    }
-  };
+    };
+
+    return OrderedSet;
+  }();
 
   /**
     A Map stores values indexed by keys. Unlike JavaScript's
@@ -26826,38 +26782,25 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @private
     @constructor
   */
-  function Map() {
-    if (this instanceof Map) {
-      this._keys = OrderedSet.create();
+
+  var Map = function () {
+    function Map() {
+
+      this._keys = new OrderedSet();
       this._values = Object.create(null);
       this.size = 0;
-    } else {
-      missingNew('Map');
     }
-  }
-
-  /**
-    @method create
-    @static
-    @private
-  */
-  Map.create = function () {
-    var Constructor = this;
-    return new Constructor();
-  };
-
-  Map.prototype = {
-    constructor: Map,
 
     /**
-      This property will change as the number of objects in the map changes.
-       @since 1.8.0
-      @property size
-      @type number
-      @default 0
+      @method create
+      @static
       @private
     */
-    size: 0,
+
+    Map.create = function () {
+      var Constructor = this;
+      return new Constructor();
+    };
 
     /**
       Retrieve the value associated with a given key.
@@ -26866,7 +26809,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {*} the value associated with the key, or `undefined`
       @private
     */
-    get: function (key) {
+
+    Map.prototype.get = function (key) {
       if (this.size === 0) {
         return;
       }
@@ -26875,7 +26819,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       var guid = emberUtils.guidFor(key);
 
       return values[guid];
-    },
+    };
 
     /**
       Adds a value to the map. If a value for the given key has already been
@@ -26886,7 +26830,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {Ember.Map}
       @private
     */
-    set: function (key, value) {
+
+    Map.prototype.set = function (key, value) {
       var keys = this._keys;
       var values = this._values;
       var guid = emberUtils.guidFor(key);
@@ -26901,7 +26846,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       this.size = keys.size;
 
       return this;
-    },
+    };
 
     /**
       Removes a value from the map for an associated key.
@@ -26911,7 +26856,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {Boolean} true if an item was removed, false otherwise
       @private
     */
-    delete: function (key) {
+
+    Map.prototype.delete = function (key) {
       if (this.size === 0) {
         return false;
       }
@@ -26928,7 +26874,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       } else {
         return false;
       }
-    },
+    };
 
     /**
       Check whether a key is present.
@@ -26937,9 +26883,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       @return {Boolean} true if the item was present, false otherwise
       @private
     */
-    has: function (key) {
+
+    Map.prototype.has = function (key) {
       return this._keys.has(key);
-    },
+    };
 
     /**
       Iterate over all the keys and values. Calls the function once
@@ -26952,10 +26899,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
         callback. By default, `this` is the map.
       @private
     */
-    forEach: function (callback /*, ...thisArg*/) {
-      if (typeof callback !== 'function') {
-        missingFunction(callback);
-      }
+
+    Map.prototype.forEach = function (callback /*, ...thisArg*/) {
+      false && !(typeof callback === 'function') && emberDebug.assert(Object.prototype.toString.call(callback) + ' is not a function', typeof callback === 'function');
 
       if (this.size === 0) {
         return;
@@ -26977,27 +26923,31 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       }
 
       this._keys.forEach(cb);
-    },
+    };
 
     /**
       @method clear
       @private
     */
-    clear: function () {
+
+    Map.prototype.clear = function () {
       this._keys.clear();
       this._values = Object.create(null);
       this.size = 0;
-    },
+    };
 
     /**
       @method copy
       @return {Ember.Map}
       @private
     */
-    copy: function () {
+
+    Map.prototype.copy = function () {
       return copyMap(this, new Map());
-    }
-  };
+    };
+
+    return Map;
+  }();
 
   /**
     @class MapWithDefault
@@ -27008,66 +26958,73 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @param [options]
       @param {*} [options.defaultValue]
   */
-  function MapWithDefault(options) {
-    this._super$constructor();
-    this.defaultValue = options.defaultValue;
-  }
 
-  /**
-    @method create
-    @static
-    @param [options]
-      @param {*} [options.defaultValue]
-    @return {Ember.MapWithDefault|Ember.Map} If options are passed, returns
-      `MapWithDefault` otherwise returns `EmberMap`
-    @private
-  */
-  MapWithDefault.create = function (options) {
-    if (options) {
-      return new MapWithDefault(options);
-    } else {
-      return new Map();
+  var MapWithDefault = function (_Map) {
+    emberBabel.inherits(MapWithDefault, _Map);
+
+    function MapWithDefault(options) {
+
+      var _this = emberBabel.possibleConstructorReturn(this, _Map.call(this));
+
+      _this.defaultValue = options.defaultValue;
+      return _this;
     }
-  };
 
-  MapWithDefault.prototype = Object.create(Map.prototype);
-  MapWithDefault.prototype.constructor = MapWithDefault;
-  MapWithDefault.prototype._super$constructor = Map;
-  MapWithDefault.prototype._super$get = Map.prototype.get;
+    /**
+      @method create
+      @static
+      @param [options]
+        @param {*} [options.defaultValue]
+      @return {Ember.MapWithDefault|Ember.Map} If options are passed, returns
+        `MapWithDefault` otherwise returns `EmberMap`
+      @private
+    */
 
-  /**
-    Retrieve the value associated with a given key.
-  
-    @method get
-    @param {*} key
-    @return {*} the value associated with the key, or the default value
-    @private
-  */
-  MapWithDefault.prototype.get = function (key) {
-    var hasValue = this.has(key),
-        defaultValue;
+    MapWithDefault.create = function (options) {
+      if (options) {
+        return new MapWithDefault(options);
+      } else {
+        return new Map();
+      }
+    };
 
-    if (hasValue) {
-      return this._super$get(key);
-    } else {
-      defaultValue = this.defaultValue(key);
+    /**
+      Retrieve the value associated with a given key.
+       @method get
+      @param {*} key
+      @return {*} the value associated with the key, or the default value
+      @private
+    */
 
-      this.set(key, defaultValue);
-      return defaultValue;
-    }
-  };
+    MapWithDefault.prototype.get = function (key) {
+      var hasValue = this.has(key),
+          defaultValue;
 
-  /**
-    @method copy
-    @return {Ember.MapWithDefault}
-    @private
-  */
-  MapWithDefault.prototype.copy = function () {
-    var Constructor = this.constructor;
-    return copyMap(this, new Constructor({
-      defaultValue: this.defaultValue
-    }));
-  };
+      if (hasValue) {
+        return _Map.prototype.get.call(this, key);
+      } else {
+        defaultValue = this.defaultValue(key);
+
+        this.set(key, defaultValue);
+        return defaultValue;
+      }
+    };
+
+    /**
+      @method copy
+      @return {Ember.MapWithDefault}
+      @private
+    */
+
+    MapWithDefault.prototype.copy = function () {
+      var Constructor = this.constructor;
+      return copyMap(this, new Constructor({
+        defaultValue: this.defaultValue
+      }));
+    };
+
+    return MapWithDefault;
+  }(Map);
 
   /**
    @module @ember/object
@@ -27821,6 +27778,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     var baseValue = values[key] || obj[key],
         propValue;
 
+    false && !!isArray(value) && emberDebug.assert('You passed in `' + JSON.stringify(value) + '` as the value for `' + key + '` but `' + key + '` cannot be an Array', !isArray(value));
+
     if (!baseValue) {
       return value;
     }
@@ -27962,7 +27921,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   }
 
   function finishPartial(obj, meta$$1) {
-    connectBindings(obj, meta$$1 || meta(obj));
+    connectBindings(obj, meta$$1 === undefined ? meta(obj) : meta$$1);
     return obj;
   }
 
@@ -28254,66 +28213,112 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       return ret;
     };
 
-    return Mixin;
-  }();
+    /**
+      @method reopen
+      @param arguments*
+      @private
+    */
 
-  Mixin._apply = applyMixin;
+    Mixin.prototype.reopen = function () {
+      var currentMixin = void 0;
 
-  Mixin.finishPartial = finishPartial;
+      if (this.properties) {
+        currentMixin = new Mixin(undefined, this.properties);
+        this.properties = undefined;
+        this.mixins = [currentMixin];
+      } else if (!this.mixins) {
+        this.mixins = [];
+      }
 
-  var unprocessedFlag = false;
+      var mixins = this.mixins;
+      var idx = void 0;
 
-  var MixinPrototype = Mixin.prototype;
+      for (idx = 0; idx < arguments.length; idx++) {
+        currentMixin = arguments[idx];
+        false && !(typeof currentMixin === 'object' && currentMixin !== null && Object.prototype.toString.call(currentMixin) !== '[object Array]') && emberDebug.assert('Expected hash or Mixin instance, got ' + Object.prototype.toString.call(currentMixin), typeof currentMixin === 'object' && currentMixin !== null && Object.prototype.toString.call(currentMixin) !== '[object Array]');
 
-  /**
-    @method reopen
-    @param arguments*
-    @private
-  */
-  MixinPrototype.reopen = function () {
-    var currentMixin = void 0;
+        if (currentMixin instanceof Mixin) {
+          mixins.push(currentMixin);
+        } else {
+          mixins.push(new Mixin(undefined, currentMixin));
+        }
+      }
 
-    if (this.properties) {
-      currentMixin = new Mixin(undefined, this.properties);
-      this.properties = undefined;
-      this.mixins = [currentMixin];
-    } else if (!this.mixins) {
-      this.mixins = [];
-    }
+      return this;
+    };
 
-    var mixins = this.mixins;
-    var idx = void 0;
+    /**
+      @method apply
+      @param obj
+      @return applied object
+      @private
+    */
 
-    for (idx = 0; idx < arguments.length; idx++) {
-      currentMixin = arguments[idx];
-      false && !(typeof currentMixin === 'object' && currentMixin !== null && Object.prototype.toString.call(currentMixin) !== '[object Array]') && emberDebug.assert('Expected hash or Mixin instance, got ' + Object.prototype.toString.call(currentMixin), typeof currentMixin === 'object' && currentMixin !== null && Object.prototype.toString.call(currentMixin) !== '[object Array]');
+    Mixin.prototype.apply = function (obj) {
+      return applyMixin(obj, [this], false);
+    };
 
-      if (currentMixin instanceof Mixin) {
-        mixins.push(currentMixin);
-      } else {
-        mixins.push(new Mixin(undefined, currentMixin));
+    Mixin.prototype.applyPartial = function (obj) {
+      return applyMixin(obj, [this], true);
+    };
+
+    /**
+      @method detect
+      @param obj
+      @return {Boolean}
+      @private
+    */
+
+    Mixin.prototype.detect = function (obj) {
+      if (typeof obj !== 'object' || obj === null) {
+        return false;
       }
-    }
+      if (obj instanceof Mixin) {
+        return _detect(obj, this, {});
+      }
+      var meta$$1 = exports.peekMeta(obj);
+      if (meta$$1 === undefined) {
+        return false;
+      }
+      return !!meta$$1.peekMixins(emberUtils.guidFor(this));
+    };
 
-    return this;
-  };
+    Mixin.prototype.without = function () {
+      var ret = new Mixin([this]),
+          _len4,
+          args,
+          _key4;
 
-  /**
-    @method apply
-    @param obj
-    @return applied object
-    @private
-  */
-  MixinPrototype.apply = function (obj) {
-    return applyMixin(obj, [this], false);
-  };
+      for (_len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+        args[_key4] = arguments[_key4];
+      }
 
-  MixinPrototype.applyPartial = function (obj) {
-    return applyMixin(obj, [this], true);
-  };
+      ret._without = args;
+      return ret;
+    };
 
+    Mixin.prototype.keys = function () {
+      var keys = {};
+
+
+      _keys(keys, this, {});
+      var ret = Object.keys(keys);
+      return ret;
+    };
+
+    return Mixin;
+  }();
+
+  Mixin._apply = applyMixin;
+  Mixin.finishPartial = finishPartial;
+
+  var MixinPrototype = Mixin.prototype;
   MixinPrototype.toString = Object.toString;
 
+  emberDebug.debugSeal(MixinPrototype);
+
+  var unprocessedFlag = false;
+
   function _detect(curMixin, targetMixin, seen) {
     var guid = emberUtils.guidFor(curMixin);
 
@@ -28335,40 +28340,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     return false;
   }
 
-  /**
-    @method detect
-    @param obj
-    @return {Boolean}
-    @private
-  */
-  MixinPrototype.detect = function (obj) {
-    if (typeof obj !== 'object' || obj === null) {
-      return false;
-    }
-    if (obj instanceof Mixin) {
-      return _detect(obj, this, {});
-    }
-    var meta$$1 = exports.peekMeta(obj);
-    if (meta$$1 === undefined) {
-      return false;
-    }
-    return !!meta$$1.peekMixins(emberUtils.guidFor(this));
-  };
-
-  MixinPrototype.without = function () {
-    var ret = new Mixin([this]),
-        _len4,
-        args,
-        _key4;
-
-    for (_len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      args[_key4] = arguments[_key4];
-    }
-
-    ret._without = args;
-    return ret;
-  };
-
   function _keys(ret, mixin, seen) {
     var props, i, key;
 
@@ -28392,17 +28363,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
   }
 
-  MixinPrototype.keys = function () {
-    var keys = {};
-
-
-    _keys(keys, this, {});
-    var ret = Object.keys(keys);
-    return ret;
-  };
-
-  emberDebug.debugSeal(MixinPrototype);
-
   var REQUIRED = new Descriptor();
   REQUIRED.toString = function () {
     return '(Required Property)';
@@ -28676,7 +28636,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     return new AliasedProperty(altKey);
   };
   exports.merge = function (original, updates) {
-    if (!updates || typeof updates !== 'object') {
+    if (updates === null || typeof updates !== 'object') {
       return original;
     }
 
@@ -28797,6 +28757,12 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   };
   exports.META_DESC = META_DESC;
   exports.meta = meta;
+  exports.deleteMeta = function (obj) {
+    var meta = exports.peekMeta(obj);
+    if (meta !== undefined) {
+      meta.destroy();
+    }
+  };
   exports.Cache = Cache;
   exports._getPath = _getPath;
   exports.get = get;
@@ -28849,7 +28815,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.suspendListeners = suspendListeners;
   exports.watchedEvents = function (obj) {
     var meta$$1 = exports.peekMeta(obj);
-    return meta$$1 && meta$$1.watchedEvents() || [];
+    return meta$$1 !== undefined ? meta$$1.watchedEvents() : [];
   };
   exports.isNone = isNone;
   exports.isEmpty = isEmpty;
@@ -28889,12 +28855,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.removeChainWatcher = removeChainWatcher;
   exports.watchPath = watchPath;
   exports.unwatchPath = unwatchPath;
-  exports.destroy = function (obj) {
-    var meta = exports.peekMeta(obj);
-    if (meta !== undefined) {
-      meta.destroy();
-    }
-  };
   exports.isWatching = function (obj, key) {
     return watcherCount(obj, key) > 0;
   };
@@ -28921,7 +28881,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     return ret;
   };
   exports.setProperties = function (obj, properties) {
-    if (!properties || typeof properties !== 'object') {
+    if (properties === null || typeof properties !== 'object') {
       return properties;
     }
     changeProperties(function () {
@@ -29043,7 +29003,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       return _glimmer_reference.CONSTANT_TAG;
     }
 
-    var meta$$1 = _meta || meta(object);
+    var meta$$1 = _meta === undefined ? meta(object) : _meta;
     if (meta$$1.isProxy()) {
       return tagFor(object, meta$$1);
     }
@@ -31621,9 +31581,9 @@ enifed('ember-routing/system/route', ['exports', 'ember-utils', 'ember-metal', '
     setup: function (context, transition) {
       var controller = void 0,
           propNames,
+          cache,
           params,
           allParams,
-          cache,
           qpValues;
 
       var controllerName = this.controllerName || this.routeName;
@@ -31654,23 +31614,18 @@ enifed('ember-routing/system/route', ['exports', 'ember-utils', 'ember-metal', '
         // Update the model dep values used to calculate cache keys.
         (0, _utils.stashParamNames)(this.router, transition.state.handlerInfos);
 
+        cache = this._bucketCache;
         params = transition.params;
         allParams = queryParams.propertyNames;
-        cache = this._bucketCache;
 
 
         allParams.forEach(function (prop) {
-          var aQp = queryParams.map[prop],
-              value;
-
+          var aQp = queryParams.map[prop];
           aQp.values = params;
-          var cacheKey = (0, _utils.calculateCacheKey)(aQp.route.fullRouteName, aQp.parts, aQp.values);
-
-          if (cache) {
-            value = cache.lookup(cacheKey, prop, aQp.undecoratedDefaultValue);
 
-            (0, _emberMetal.set)(controller, prop, value);
-          }
+          var cacheKey = (0, _utils.calculateCacheKey)(aQp.route.fullRouteName, aQp.parts, aQp.values);
+          var value = cache.lookup(cacheKey, prop, aQp.undecoratedDefaultValue);
+          (0, _emberMetal.set)(controller, prop, value);
         });
 
         qpValues = getQueryParamsFor(this, transition.state);
@@ -31689,13 +31644,10 @@ enifed('ember-routing/system/route', ['exports', 'ember-utils', 'ember-metal', '
         return;
       }
 
-      var cacheKey = (0, _utils.calculateCacheKey)(qp.route.fullRouteName, qp.parts, qp.values);
-
       // Update model-dep cache
       var cache = this._bucketCache;
-      if (cache) {
-        cache.stash(cacheKey, prop, value);
-      }
+      var cacheKey = (0, _utils.calculateCacheKey)(qp.route.fullRouteName, qp.parts, qp.values);
+      cache.stash(cacheKey, prop, value);
     },
 
     /**
@@ -32317,7 +32269,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
 
     _initRouterJs: function () {
       var routerMicrolib = this._routerMicrolib = new _router.default();
-      routerMicrolib.triggerEvent = triggerEvent;
+      routerMicrolib.triggerEvent = triggerEvent.bind(this);
 
       routerMicrolib._triggerWillChangeContext = K;
       routerMicrolib._triggerWillLeave = K;
@@ -33108,26 +33060,27 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
     @param {Function} callback
     @return {Void}
    */
-  function forEachRouteAbove(originRoute, handlerInfos, callback) {
-    var originRouteFound = false,
-        i,
-        handlerInfo,
-        route;
+  function forEachRouteAbove(handlerInfos, callback) {
+    var i, handlerInfo, route;
+
 
     for (i = handlerInfos.length - 1; i >= 0; --i) {
       handlerInfo = handlerInfos[i];
       route = handlerInfo.handler;
 
+      // handlerInfo.handler being `undefined` generally means either:
+      //
+      // 1. an error occurred during creation of the route in question
+      // 2. the route is across an async boundary (e.g. within an engine)
+      //
+      // In both of these cases, we cannot invoke the callback on that specific
+      // route, because it just doesn't exist...
 
-      if (originRoute === route) {
-        originRouteFound = true;
-      }
-
-      if (!originRouteFound) {
+      if (route === undefined) {
         continue;
       }
 
-      if (callback(route) !== true) {
+      if (callback(route, handlerInfo) !== true) {
         return;
       }
     }
@@ -33136,18 +33089,19 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
   // These get invoked when an action bubbles above ApplicationRoute
   // and are not meant to be overridable.
   var defaultActionHandlers = {
-    willResolveModel: function (transition, originRoute) {
-      originRoute.router._scheduleLoadingEvent(transition, originRoute);
+    willResolveModel: function (handlerInfos, transition, originRoute) {
+      this._scheduleLoadingEvent(transition, originRoute);
     },
-    error: function (error, transition, originRoute) {
-      var handlerInfos = transition.state.handlerInfos;
-      var router = originRoute.router;
+    error: function (handlerInfos, error, transition) {
+      var router = this;
+
+      var handlerInfoWithError = handlerInfos[handlerInfos.length - 1];
 
-      forEachRouteAbove(originRoute, handlerInfos, function (route) {
-        // Check for the existence of an 'error' route.
-        // We don't check for an 'error' route on the originRoute, since that would
+      forEachRouteAbove(handlerInfos, function (route, handlerInfo) {
+        // We don't check the leaf most handlerInfo since that would
         // technically be below where we're at in the route hierarchy.
-        if (originRoute !== route) {
+        if (handlerInfo !== handlerInfoWithError) {
+          // Check for the existence of an 'error' route.
           errorRouteName = findRouteStateName(route, 'error');
 
           if (errorRouteName) {
@@ -33177,15 +33131,16 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
 
       logError(error, 'Error while processing route: ' + transition.targetName);
     },
-    loading: function (transition, originRoute) {
-      var handlerInfos = transition.state.handlerInfos;
-      var router = originRoute.router;
+    loading: function (handlerInfos, transition) {
+      var router = this;
+
+      var handlerInfoWithSlowLoading = handlerInfos[handlerInfos.length - 1];
 
-      forEachRouteAbove(originRoute, handlerInfos, function (route) {
-        // Check for the existence of a 'loading' route.
-        // We don't check for a 'loading' route on the originRoute, since that would
+      forEachRouteAbove(handlerInfos, function (route, handlerInfo) {
+        // We don't check the leaf most handlerInfo since that would
         // technically be below where we're at in the route hierarchy.
-        if (originRoute !== route) {
+        if (handlerInfo !== handlerInfoWithSlowLoading) {
+          // Check for the existence of a 'loading' route.
           loadingRouteName = findRouteStateName(route, 'loading');
 
           if (loadingRouteName) {
@@ -33334,7 +33289,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
 
     var defaultHandler = defaultActionHandlers[name];
     if (defaultHandler) {
-      defaultHandler.apply(null, args);
+      defaultHandler.apply(this, [handlerInfos].concat(args));
       return;
     }
 
@@ -34055,8 +34010,10 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal', 'emb
     @static
     @for @ember/object/computed
     @param {String} dependentKey
-    @return {ComputedProperty} computed property which negate
-    the original value for property
+    @return {ComputedProperty} computed property which returns true if
+    the value of the dependent property is null, an empty string, empty array,
+    or empty function and false if the underlying value is not empty.
+  
     @public
   */
   function (dependentKey) {
@@ -37235,9 +37192,8 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-utils', 'ember-metal', '
     arrayWillChange: function (content, idx, removedCnt) {
       var keys = this._keys;
       var lim = removedCnt > 0 ? idx + removedCnt : -1;
-      var meta = void 0;
+      var meta = (0, _emberMetal.peekMeta)(this);
       for (var key in keys) {
-        meta = meta || (0, _emberMetal.peekMeta)(this);
         if (lim > 0) {
           removeObserverForContentKey(content, key, this, idx, lim);
         }
@@ -37247,9 +37203,8 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-utils', 'ember-metal', '
     arrayDidChange: function (content, idx, removedCnt, addedCnt) {
       var keys = this._keys;
       var lim = addedCnt > 0 ? idx + addedCnt : -1;
-      var meta = void 0;
+      var meta = (0, _emberMetal.peekMeta)(this);
       for (var key in keys) {
-        meta = meta || (0, _emberMetal.peekMeta)(this);
         if (lim > 0) {
           addObserverForContentKey(content, key, this, idx, lim);
         }
@@ -40282,7 +40237,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
     if (m.isSourceDestroyed()) {
       return;
     }
-    (0, _emberMetal.destroy)(this);
+    (0, _emberMetal.deleteMeta)(this);
     m.setSourceDestroyed();
   }, _Mixin$create.bind = function (to, from) {
     if (!(from instanceof _emberMetal.Binding)) {
@@ -40405,30 +40360,6 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
     }
   }, _ClassMixinProps);
 
-  /**
-    Returns a hash of property names and container names that injected
-    properties will lookup on the container lazily.
-  
-    @method _lazyInjections
-    @return {Object} Hash of all lazy injected property keys to container names
-    @private
-  */
-  ClassMixinProps._lazyInjections = function () {
-    var injections = {};
-    var proto = this.proto();
-    var key = void 0;
-    var desc = void 0;
-
-    for (key in proto) {
-      desc = proto[key];
-      if (desc instanceof _emberMetal.InjectedProperty) {
-        injections[key] = desc.type + ':' + (desc.name || key);
-      }
-    }
-
-    return injections;
-  };
-
   var ClassMixin = _emberMetal.Mixin.create(ClassMixinProps);
 
   ClassMixin.ownerConstructor = CoreObject;
@@ -40754,7 +40685,7 @@ enifed('ember-runtime/system/namespace', ['exports', 'ember-utils', 'ember-metal
 
   exports.default = Namespace;
 });
-enifed('ember-runtime/system/native_array', ['exports', 'ember-metal', 'ember-environment', 'ember-runtime/mixins/array', 'ember-runtime/mixins/mutable_array', 'ember-runtime/mixins/observable', 'ember-runtime/mixins/copyable', 'ember-runtime/mixins/freezable', 'ember-runtime/copy'], function (exports, _emberMetal, _emberEnvironment, _array, _mutable_array, _observable, _copyable, _freezable, _copy) {
+enifed('ember-runtime/system/native_array', ['exports', 'ember-metal', 'ember-environment', 'ember-runtime/mixins/array', 'ember-runtime/mixins/mutable_array', 'ember-runtime/mixins/observable', 'ember-runtime/mixins/copyable', 'ember-debug', 'ember-runtime/mixins/freezable', 'ember-runtime/copy'], function (exports, _emberMetal, _emberEnvironment, _array, _mutable_array, _observable, _copyable, _emberDebug, _freezable, _copy) {
   'use strict';
 
   exports.NativeArray = exports.A = undefined;
@@ -40790,9 +40721,7 @@ enifed('ember-runtime/system/native_array', ['exports', 'ember-metal', 'ember-en
       return this[idx];
     },
     replace: function (idx, amt, objects) {
-      if (this.isFrozen) {
-        throw _freezable.FROZEN_ERROR;
-      }
+      false && !!this.isFrozen && (0, _emberDebug.assert)(_freezable.FROZEN_ERROR, !this.isFrozen);
 
       // if we replaced exactly the same number of items, then pass only the
       // replaced range. Otherwise, pass the full remaining array length
@@ -41899,7 +41828,7 @@ enifed('ember-utils', ['exports'], function (exports) {
     @private
   */
   function canInvoke(obj, methodName) {
-    return !!(obj && typeof obj[methodName] === 'function');
+    return obj !== null && obj !== undefined && typeof obj[methodName] === 'function';
   }
 
   /**
@@ -44137,7 +44066,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'node-module',
   _emberMetal.default.watch = _emberMetal.watch;
   _emberMetal.default.isWatching = _emberMetal.isWatching;
   _emberMetal.default.unwatch = _emberMetal.unwatch;
-  _emberMetal.default.destroy = _emberMetal.destroy;
+  _emberMetal.default.destroy = _emberMetal.deleteMeta;
   _emberMetal.default.libraries = _emberMetal.libraries;
   _emberMetal.default.OrderedSet = _emberMetal.OrderedSet;
   _emberMetal.default.Map = _emberMetal.Map;
@@ -44551,7 +44480,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'node-module',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.16.3";
+  exports.default = "2.17.0-beta.4";
 });
 enifed('node-module', ['exports'], function(_exports) {
   var IS_NODE = typeof module === 'object' && typeof module.require === 'function';
@@ -45307,23 +45236,13 @@ enifed("route-recognizer", ["exports"], function (exports) {
 
     exports.default = RouteRecognizer;
 });
-enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _routeRecognizer, _rsvp) {
+enifed('router', ['exports', 'ember-babel', 'route-recognizer', 'rsvp'], function (exports, _emberBabel, _routeRecognizer, _rsvp) {
   'use strict';
 
   exports.Transition = undefined;
 
   var slice = Array.prototype.slice;
-
-  var _isArray;
-  if (!Array.isArray) {
-    _isArray = function (x) {
-      return Object.prototype.toString.call(x) === "[object Array]";
-    };
-  } else {
-    _isArray = Array.isArray;
-  }
-
-  var isArray = _isArray;
+  var hasOwnProperty = Object.prototype.hasOwnProperty;
 
   /**
     Determines if an object is Promise by checking if it is "thenable".
@@ -45334,18 +45253,12 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
   function merge(hash, other) {
     for (var prop in other) {
-      if (other.hasOwnProperty(prop)) {
+      if (hasOwnProperty.call(other, prop)) {
         hash[prop] = other[prop];
       }
     }
   }
 
-  var oCreate = Object.create || function (proto) {
-    function F() {}
-    F.prototype = proto;
-    return new F();
-  };
-
   /**
     @private
   
@@ -45353,8 +45266,8 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   **/
   function extractQueryParams(array) {
     var len = array && array.length,
-        head,
-        queryParams;
+        head = void 0,
+        queryParams = void 0;
 
     if (len && len > 0 && array[len - 1] && array[len - 1].hasOwnProperty('queryParams')) {
       queryParams = array[len - 1].queryParams;
@@ -45376,7 +45289,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     for (var key in queryParams) {
       if (typeof queryParams[key] === 'number') {
         queryParams[key] = '' + queryParams[key];
-      } else if (isArray(queryParams[key])) {
+      } else if (Array.isArray(queryParams[key])) {
         for (i = 0, l = queryParams[key].length; i < l; i++) {
           queryParams[key][i] = '' + queryParams[key][i];
         }
@@ -45386,39 +45299,32 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   /**
     @private
    */
-  function log(router, sequence, msg) {
+  function _log(router, sequence, msg) {
     if (!router.log) {
       return;
     }
 
     if (arguments.length === 3) {
-      router.log("Transition #" + sequence + ": " + msg);
+      router.log('Transition #' + sequence + ': ' + msg);
     } else {
       msg = sequence;
       router.log(msg);
     }
   }
 
-  function bind(context, fn) {
-    var boundArgs = arguments;
-    return function (value) {
-      var args = slice.call(boundArgs, 2);
-      args.push(value);
-      return fn.apply(context, args);
-    };
-  }
-
   function isParam(object) {
-    return typeof object === "string" || object instanceof String || typeof object === "number" || object instanceof Number;
+    return typeof object === 'string' || object instanceof String || typeof object === 'number' || object instanceof Number;
   }
 
   function forEach(array, callback) {
     var i, l;
 
-    for (i = 0, l = array.length; i < l && false !== callback(array[i]); i++) {}
+    for (i = 0, l = array.length; i < l && false !== callback(array[i]); i++) {
+      // empty intentionally
+    }
   }
 
-  function trigger(router, handlerInfos, ignoreFailure, args) {
+  function _trigger(router, handlerInfos, ignoreFailure, args) {
     if (router.triggerEvent) {
       router.triggerEvent(handlerInfos, ignoreFailure, args);
       return;
@@ -45449,7 +45355,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       // means that we should trigger the event later when the handler is available
 
       if (!handler) {
-        handlerInfo.handlerPromise.then(bind(null, delayedEvent, name, args));
+        handlerInfo.handlerPromise.then(delayedEvent.bind(null, name, args));
         continue;
       }
 
@@ -45472,13 +45378,14 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   }
 
   function getChangelist(oldObject, newObject) {
+    var key = void 0,
+        i,
+        l;
     var results = {
       all: {},
       changed: {},
       removed: {}
-    },
-        i,
-        l;
+    };
 
     merge(results.all, newObject);
 
@@ -45487,9 +45394,9 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     coerceQueryParamsToString(newObject);
 
     // Calculate removals
-    for (var key in oldObject) {
-      if (oldObject.hasOwnProperty(key)) {
-        if (!newObject.hasOwnProperty(key)) {
+    for (key in oldObject) {
+      if (hasOwnProperty.call(oldObject, key)) {
+        if (!hasOwnProperty.call(newObject, key)) {
           didChange = true;
           results.removed[key] = oldObject[key];
         }
@@ -45498,8 +45405,8 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
     // Calculate changes
     for (key in newObject) {
-      if (newObject.hasOwnProperty(key)) {
-        if (isArray(oldObject[key]) && isArray(newObject[key])) {
+      if (hasOwnProperty.call(newObject, key)) {
+        if (Array.isArray(oldObject[key]) && Array.isArray(newObject[key])) {
           if (oldObject[key].length !== newObject[key].length) {
             results.changed[key] = newObject[key];
             didChange = true;
@@ -45523,24 +45430,15 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     return didChange && results;
   }
 
-  function promiseLabel(label) {
+  function _promiseLabel(label) {
     return 'Router: ' + label;
   }
 
-  function subclass(parentConstructor, proto) {
-    function C(props) {
-      parentConstructor.call(this, props || {});
-    }
-    C.prototype = oCreate(parentConstructor.prototype);
-    merge(C.prototype, proto);
-    return C;
-  }
-
   function resolveHook(obj, hookName) {
     if (!obj) {
       return;
     }
-    var underscored = "_" + hookName;
+    var underscored = '_' + hookName;
     return obj[underscored] && underscored || obj[hookName] && hookName;
   }
 
@@ -45579,7 +45477,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         }
         targetName += handlerInfo.name;
       });
-      return promiseLabel("'" + targetName + "': " + label);
+      return _promiseLabel("'" + targetName + "': " + label);
     },
 
     resolve: function (shouldContinue, payload) {
@@ -45597,7 +45495,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       var wasAborted = false;
 
       // The prelude RSVP.resolve() asyncs us into the promise land.
-      return _rsvp.Promise.resolve(null, this.promiseLabel("Start transition")).then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler'))['catch'](function (error) {
+      return _rsvp.Promise.resolve(null, this.promiseLabel('Start transition')).then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler')).catch(function (error) {
         // This is the only possible
         // reject value of TransitionState#resolve
         var handlerInfos = currentState.handlerInfos;
@@ -45611,13 +45509,13 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       }, this.promiseLabel('Handle error'));
 
       function innerShouldContinue() {
-        return _rsvp.Promise.resolve(shouldContinue(), currentState.promiseLabel("Check if should continue"))['catch'](function (reason) {
+        return _rsvp.Promise.resolve(shouldContinue(), currentState.promiseLabel('Check if should continue')).catch(function (reason) {
           // We distinguish between errors that occurred
-          // during resolution (e.g. beforeModel/model/afterModel),
+          // during resolution (e.g. before"Model/model/afterModel),
           // and aborts due to a rejecting promise from shouldContinue().
           wasAborted = true;
           return _rsvp.Promise.reject(reason);
-        }, currentState.promiseLabel("Handle abort"));
+        }, currentState.promiseLabel('Handle abort'));
       }
 
       function proceed(resolvedHandlerInfo) {
@@ -45682,7 +45580,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     this.code = error.code;
   }
 
-  TransitionAbortedError.prototype = oCreate(Error.prototype);
+  TransitionAbortedError.prototype = Object.create(Error.prototype);
 
   /**
     A Transition is a thennable (a promise-like object) that represents
@@ -45699,101 +45597,90 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     @param {Object} error
     @private
    */
-  function Transition(router, intent, state, error, previousTransition) {
-    var transition = this,
-        len,
-        i,
-        handlerInfo;
-    this.state = state || router.state;
-    this.intent = intent;
-    this.router = router;
-    this.data = this.intent && this.intent.data || {};
-    this.resolvedModels = {};
-    this.queryParams = {};
-    this.promise = undefined;
-    this.error = undefined;
-    this.params = undefined;
-    this.handlerInfos = undefined;
-    this.targetName = undefined;
-    this.pivotHandler = undefined;
-    this.sequence = undefined;
-    this.isAborted = false;
-    this.isActive = true;
-
-    if (error) {
-      this.promise = _rsvp.Promise.reject(error);
-      this.error = error;
-      return;
-    }
-
-    // if you're doing multiple redirects, need the new transition to know if it
-    // is actually part of the first transition or not. Any further redirects
-    // in the initial transition also need to know if they are part of the
-    // initial transition
-    this.isCausedByAbortingTransition = !!previousTransition;
-    this.isCausedByInitialTransition = previousTransition && (previousTransition.isCausedByInitialTransition || previousTransition.sequence === 0);
-
-    if (state) {
-      this.params = state.params;
-      this.queryParams = state.queryParams;
-      this.handlerInfos = state.handlerInfos;
 
-      len = state.handlerInfos.length;
+  var Transition = function () {
+    function Transition(router, intent, state, error, previousTransition) {
+      var _this = this,
+          len,
+          i,
+          handlerInfo;
 
-      if (len) {
-        this.targetName = state.handlerInfos[len - 1].name;
+      this.state = state || router.state;
+      this.intent = intent;
+      this.router = router;
+      this.data = this.intent && this.intent.data || {};
+      this.resolvedModels = {};
+      this.queryParams = {};
+      this.promise = undefined;
+      this.error = undefined;
+      this.params = undefined;
+      this.handlerInfos = undefined;
+      this.targetName = undefined;
+      this.pivotHandler = undefined;
+      this.sequence = undefined;
+      this.isAborted = false;
+      this.isActive = true;
+      this.urlMethod = 'update';
+      this.resolveIndex = 0;
+      this.queryParamsOnly = false;
+      this.isTransition = true;
+
+      if (error) {
+        this.promise = _rsvp.Promise.reject(error);
+        this.error = error;
+        return;
       }
 
-      for (i = 0; i < len; ++i) {
-        handlerInfo = state.handlerInfos[i];
+      // if you're doing multiple redirects, need the new transition to know if it
+      // is actually part of the first transition or not. Any further redirects
+      // in the initial transition also need to know if they are part of the
+      // initial transition
+      this.isCausedByAbortingTransition = !!previousTransition;
+      this.isCausedByInitialTransition = previousTransition && (previousTransition.isCausedByInitialTransition || previousTransition.sequence === 0);
 
-        // TODO: this all seems hacky
+      if (state) {
+        this.params = state.params;
+        this.queryParams = state.queryParams;
+        this.handlerInfos = state.handlerInfos;
 
-        if (!handlerInfo.isResolved) {
-          break;
+        len = state.handlerInfos.length;
+
+        if (len) {
+          this.targetName = state.handlerInfos[len - 1].name;
         }
-        this.pivotHandler = handlerInfo.handler;
-      }
 
-      this.sequence = router.currentSequence++;
-      this.promise = state.resolve(checkForAbort, this)['catch'](catchHandlerForTransition(transition), promiseLabel('Handle Abort'));
-    } else {
-      this.promise = _rsvp.Promise.resolve(this.state);
-      this.params = {};
-    }
+        for (i = 0; i < len; ++i) {
+          handlerInfo = state.handlerInfos[i];
 
-    function checkForAbort() {
-      if (transition.isAborted) {
-        return _rsvp.Promise.reject(undefined, promiseLabel("Transition aborted - reject"));
-      }
-    }
-  }
+          // TODO: this all seems hacky
 
-  function catchHandlerForTransition(transition) {
-    return function (result) {
-      if (result.wasAborted || transition.isAborted) {
-        return _rsvp.Promise.reject(logAbort(transition));
+          if (!handlerInfo.isResolved) {
+            break;
+          }
+          this.pivotHandler = handlerInfo.handler;
+        }
+
+        this.sequence = router.currentSequence++;
+        this.promise = state.resolve(function () {
+          if (_this.isAborted) {
+            return _rsvp.Promise.reject(undefined, _promiseLabel('Transition aborted - reject'));
+          }
+        }, this).catch(function (result) {
+          if (result.wasAborted || _this.isAborted) {
+            return _rsvp.Promise.reject(logAbort(_this));
+          } else {
+            _this.trigger('error', result.error, _this, result.handlerWithError);
+            _this.abort();
+            return _rsvp.Promise.reject(result.error);
+          }
+        }, _promiseLabel('Handle Abort'));
       } else {
-        transition.trigger('error', result.error, transition, result.handlerWithError);
-        transition.abort();
-        return _rsvp.Promise.reject(result.error);
+        this.promise = _rsvp.Promise.resolve(this.state);
+        this.params = {};
       }
-    };
-  }
-
-  Transition.prototype = {
-    targetName: null,
-    urlMethod: 'update',
-    intent: null,
-    pivotHandler: null,
-    resolveIndex: 0,
-    resolvedModels: null,
-    state: null,
-    queryParamsOnly: false,
-
-    isTransition: true,
+    }
 
-    isExiting: function (handler) {
+    Transition.prototype.isExiting = function (handler) {
       var handlerInfos = this.handlerInfos,
           i,
           len,
@@ -45806,109 +45693,33 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         }
       }
       return true;
-    },
-
-    /**
-      The Transition's internal promise. Calling `.then` on this property
-      is that same as calling `.then` on the Transition object itself, but
-      this property is exposed for when you want to pass around a
-      Transition's promise, but not the Transition object itself, since
-      Transition object can be externally `abort`ed, while the promise
-      cannot.
-       @property promise
-      @type {Object}
-      @public
-     */
-    promise: null,
-
-    /**
-      Custom state can be stored on a Transition's `data` object.
-      This can be useful for decorating a Transition within an earlier
-      hook and shared with a later hook. Properties set on `data` will
-      be copied to new transitions generated by calling `retry` on this
-      transition.
-       @property data
-      @type {Object}
-      @public
-     */
-    data: null,
+    };
 
-    /**
-      A standard promise hook that resolves if the transition
-      succeeds and rejects if it fails/redirects/aborts.
-       Forwards to the internal `promise` property which you can
-      use in situations where you want to pass around a thennable,
-      but not the Transition itself.
-       @method then
-      @param {Function} onFulfilled
-      @param {Function} onRejected
-      @param {String} label optional string for labeling the promise.
-      Useful for tooling.
-      @return {Promise}
-      @public
-     */
-    then: function (onFulfilled, onRejected, label) {
+    Transition.prototype.then = function (onFulfilled, onRejected, label) {
       return this.promise.then(onFulfilled, onRejected, label);
-    },
+    };
 
-    /**
-       Forwards to the internal `promise` property which you can
-      use in situations where you want to pass around a thennable,
-      but not the Transition itself.
-       @method catch
-      @param {Function} onRejection
-      @param {String} label optional string for labeling the promise.
-      Useful for tooling.
-      @return {Promise}
-      @public
-     */
-    catch: function (onRejection, label) {
+    Transition.prototype.catch = function (onRejection, label) {
       return this.promise.catch(onRejection, label);
-    },
+    };
 
-    /**
-       Forwards to the internal `promise` property which you can
-      use in situations where you want to pass around a thennable,
-      but not the Transition itself.
-       @method finally
-      @param {Function} callback
-      @param {String} label optional string for labeling the promise.
-      Useful for tooling.
-      @return {Promise}
-      @public
-     */
-    finally: function (callback, label) {
+    Transition.prototype.finally = function (callback, label) {
       return this.promise.finally(callback, label);
-    },
+    };
 
-    /**
-      Aborts the Transition. Note you can also implicitly abort a transition
-      by initiating another transition while a previous one is underway.
-       @method abort
-      @return {Transition} this transition
-      @public
-     */
-    abort: function () {
+    Transition.prototype.abort = function () {
       if (this.isAborted) {
         return this;
       }
-      log(this.router, this.sequence, this.targetName + ": transition was aborted");
+      _log(this.router, this.sequence, this.targetName + ': transition was aborted');
       this.intent.preTransitionState = this.router.state;
       this.isAborted = true;
       this.isActive = false;
       this.router.activeTransition = null;
       return this;
-    },
+    };
 
-    /**
-       Retries a previously-aborted transition (making sure to abort the
-      transition if it's still active). Returns a new transition that
-      represents the new attempt to transition.
-       @method retry
-      @return {Transition} new transition
-      @public
-     */
-    retry: function () {
+    Transition.prototype.retry = function () {
       // TODO: add tests for merged state retry()s
       this.abort();
       var newTransition = this.router.transitionByIntent(this.intent, false);
@@ -45925,41 +45736,14 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         newTransition.method(this.urlMethod);
       }
       return newTransition;
-    },
+    };
 
-    /**
-       Sets the URL-changing method to be employed at the end of a
-      successful transition. By default, a new Transition will just
-      use `updateURL`, but passing 'replace' to this method will
-      cause the URL to update using 'replaceWith' instead. Omitting
-      a parameter will disable the URL change, allowing for transitions
-      that don't update the URL at completion (this is also used for
-      handleURL, since the URL has already changed before the
-      transition took place).
-       @method method
-      @param {String} method the type of URL-changing method to use
-        at the end of a transition. Accepted values are 'replace',
-        falsy values, or any other non-falsy value (which is
-        interpreted as an updateURL transition).
-       @return {Transition} this transition
-      @public
-     */
-    method: function (method) {
-      this.urlMethod = method;
+    Transition.prototype.method = function (_method) {
+      this.urlMethod = _method;
       return this;
-    },
+    };
 
-    /**
-       Fires an event on the current list of resolved/resolving
-      handlers within this transition. Useful for firing events
-      on route hierarchies that haven't fully been entered yet.
-       Note: This method is also aliased as `send`
-       @method trigger
-      @param {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
-      @param {String} name the name of the event to fire
-      @public
-     */
-    trigger: function (ignoreFailure) {
+    Transition.prototype.trigger = function (ignoreFailure) {
       var args = slice.call(arguments);
       if (typeof ignoreFailure === 'boolean') {
         args.shift();
@@ -45967,41 +45751,29 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         // Throw errors on unhandled trigger events by default
         ignoreFailure = false;
       }
-      trigger(this.router, this.state.handlerInfos.slice(0, this.resolveIndex + 1), ignoreFailure, args);
-    },
+      _trigger(this.router, this.state.handlerInfos.slice(0, this.resolveIndex + 1), ignoreFailure, args);
+    };
 
-    /**
-      Transitions are aborted and their promises rejected
-      when redirects occur; this method returns a promise
-      that will follow any redirects that occur and fulfill
-      with the value fulfilled by any redirecting transitions
-      that occur.
-       @method followRedirects
-      @return {Promise} a promise that fulfills with the same
-        value that the final redirecting transition fulfills with
-      @public
-     */
-    followRedirects: function () {
+    Transition.prototype.followRedirects = function () {
       var router = this.router;
-      return this.promise['catch'](function (reason) {
+      return this.promise.catch(function (reason) {
         if (router.activeTransition) {
           return router.activeTransition.followRedirects();
         }
         return _rsvp.Promise.reject(reason);
       });
-    },
+    };
 
-    toString: function () {
-      return "Transition (sequence " + this.sequence + ")";
-    },
+    Transition.prototype.toString = function () {
+      return 'Transition (sequence ' + this.sequence + ')';
+    };
 
-    /**
-      @private
-     */
-    log: function (message) {
-      log(this.router, this.sequence, message);
-    }
-  };
+    Transition.prototype.log = function (message) {
+      _log(this.router, this.sequence, message);
+    };
+
+    return Transition;
+  }();
 
   // Alias 'trigger' as 'send'
   Transition.prototype.send = Transition.prototype.trigger;
@@ -46009,63 +45781,50 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   /**
     @private
   
-    Logs and returns an instance of TransitionAbortedError.
+    Logs and returns an instance of TransitionAborted.
    */
   function logAbort(transition) {
-    log(transition.router, transition.sequence, "detected abort.");
+    _log(transition.router, transition.sequence, 'detected abort.');
     return new TransitionAbortedError();
   }
 
-  function TransitionIntent(props) {
-    this.initialize(props);
+  var TransitionIntent = function () {
 
-    // TODO: wat
     this.data = this.data || {};
-  }
-
-  TransitionIntent.prototype = {
-    initialize: null,
-    applyToState: null
   };
 
   var DEFAULT_HANDLER = Object.freeze({});
 
-  function HandlerInfo(_props) {
-    var props = _props || {},
-        name;
-
-    // Set a default handler to ensure consistent object shape
-    this._handler = DEFAULT_HANDLER;
+  var HandlerInfo = function () {
+    function HandlerInfo(_props) {
 
-    if (props.handler) {
-      name = props.name;
+      var props = _props || {};
 
-      // Setup a handlerPromise so that we can wait for asynchronously loaded handlers
-
-      this.handlerPromise = _rsvp.Promise.resolve(props.handler);
+      // initialize local properties to ensure consistent object shape
+      this._handler = DEFAULT_HANDLER;
+      this._handlerPromise = null;
+      this.factory = null; // Injected by the handler info factory
+      this.name = props.name;
 
-      // Wait until the 'handler' property has been updated when chaining to a handler
-      // that is a promise
-      if (isPromise(props.handler)) {
-        this.handlerPromise = this.handlerPromise.then(bind(this, this.updateHandler));
-        props.handler = undefined;
-      } else if (props.handler) {
-        // Store the name of the handler on the handler for easy checks later
-        props.handler._handlerName = name;
+      for (var prop in props) {
+        if (prop === 'handler') {
+          this._processHandler(props.handler);
+        } else {
+          this[prop] = props[prop];
+        }
       }
     }
 
-    merge(this, props);
-    this.initialize(props);
-  }
+    HandlerInfo.prototype.getHandler = function () {};
 
-  HandlerInfo.prototype = {
-    name: null,
+    HandlerInfo.prototype.fetchHandler = function () {
+      var handler = this.getHandler(this.name);
 
-    getHandler: function () {},
+      return this._processHandler(handler);
+    };
 
-    fetchHandler: function () {
-      var handler = this.getHandler(this.name);
+    HandlerInfo.prototype._processHandler = function (handler) {
+      var _this2 = this;
 
       // Setup a handlerPromise so that we can wait for asynchronously loaded handlers
       this.handlerPromise = _rsvp.Promise.resolve(handler);
@@ -46073,75 +45832,65 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       // Wait until the 'handler' property has been updated when chaining to a handler
       // that is a promise
       if (isPromise(handler)) {
-        this.handlerPromise = this.handlerPromise.then(bind(this, this.updateHandler));
+        this.handlerPromise = this.handlerPromise.then(function (h) {
+          return _this2.updateHandler(h);
+        });
+        // set to undefined to avoid recursive loop in the handler getter
+        return this.handler = undefined;
       } else if (handler) {
-        // Store the name of the handler on the handler for easy checks later
-        handler._handlerName = this.name;
-        return this.handler = handler;
+        return this.updateHandler(handler);
       }
+    };
 
-      return this.handler = undefined;
-    },
-
-    _handlerPromise: undefined,
-
-    params: null,
-    context: null,
-
-    // Injected by the handler info factory.
-    factory: null,
-
-    initialize: function () {},
-
-    log: function (payload, message) {
+    HandlerInfo.prototype.log = function (payload, message) {
       if (payload.log) {
         payload.log(this.name + ': ' + message);
       }
-    },
+    };
 
-    promiseLabel: function (label) {
-      return promiseLabel("'" + this.name + "' " + label);
-    },
+    HandlerInfo.prototype.promiseLabel = function (label) {
+      return _promiseLabel("'" + this.name + "' " + label);
+    };
 
-    getUnresolved: function () {
+    HandlerInfo.prototype.getUnresolved = function () {
       return this;
-    },
+    };
 
-    serialize: function () {
+    HandlerInfo.prototype.serialize = function () {
       return this.params || {};
-    },
+    };
 
-    updateHandler: function (handler) {
+    HandlerInfo.prototype.updateHandler = function (handler) {
       // Store the name of the handler on the handler for easy checks later
       handler._handlerName = this.name;
       return this.handler = handler;
-    },
+    };
 
-    resolve: function (shouldContinue, payload) {
-      var checkForAbort = bind(this, this.checkForAbort, shouldContinue),
-          beforeModel = bind(this, this.runBeforeModelHook, payload),
-          model = bind(this, this.getModel, payload),
-          afterModel = bind(this, this.runAfterModelHook, payload),
-          becomeResolved = bind(this, this.becomeResolved, payload),
+    HandlerInfo.prototype.resolve = function (shouldContinue, payload) {
+      var checkForAbort = this.checkForAbort.bind(this, shouldContinue),
+          beforeModel = this.runBeforeModelHook.bind(this, payload),
+          model = this.getModel.bind(this, payload),
+          afterModel = this.runAfterModelHook.bind(this, payload),
+          becomeResolved = this.becomeResolved.bind(this, payload),
           self = this;
 
-      return _rsvp.Promise.resolve(this.handlerPromise, this.promiseLabel("Start handler")).then(function (handler) {
+      return _rsvp.Promise.resolve(this.handlerPromise, this.promiseLabel('Start handler')).then(function (handler) {
         // We nest this chain in case the handlerPromise has an error so that
         // we don't have to bubble it through every step
-        return _rsvp.Promise.resolve(handler).then(checkForAbort, null, self.promiseLabel("Check for abort")).then(beforeModel, null, self.promiseLabel("Before model")).then(checkForAbort, null, self.promiseLabel("Check if aborted during 'beforeModel' hook")).then(model, null, self.promiseLabel("Model")).then(checkForAbort, null, self.promiseLabel("Check if aborted in 'model' hook")).then(afterModel, null, self.promiseLabel("After model")).then(checkForAbort, null, self.promiseLabel("Check if aborted in 'afterModel' hook")).then(becomeResolved, null, self.promiseLabel("Become resolved"));
+        return _rsvp.Promise.resolve(handler).then(checkForAbort, null, self.promiseLabel('Check for abort')).then(beforeModel, null, self.promiseLabel('Before model')).then(checkForAbort, null, self.promiseLabel("Check if aborted during 'beforeModel' hook")).then(model, null, self.promiseLabel('Model')).then(checkForAbort, null, self.promiseLabel("Check if aborted in 'model' hook")).then(afterModel, null, self.promiseLabel('After model')).then(checkForAbort, null, self.promiseLabel("Check if aborted in 'afterModel' hook")).then(becomeResolved, null, self.promiseLabel('Become resolved'));
       }, function (error) {
         throw error;
       });
-    },
+    };
 
-    runBeforeModelHook: function (payload) {
+    HandlerInfo.prototype.runBeforeModelHook = function (payload) {
       if (payload.trigger) {
         payload.trigger(true, 'willResolveModel', payload, this.handler);
       }
       return this.runSharedModelHook(payload, 'beforeModel', []);
-    },
+    };
 
-    runAfterModelHook: function (payload, resolvedModel) {
+    HandlerInfo.prototype.runAfterModelHook = function (payload, resolvedModel) {
       // Stash the resolved model on the payload.
       // This makes it possible for users to swap out
       // the resolved model in afterModel.
@@ -46153,11 +45902,11 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         // Return the value stashed in resolvedModels, which
         // might have been swapped out in afterModel.
         return payload.resolvedModels[name];
-      }, null, this.promiseLabel("Ignore fulfillment value and return model value"));
-    },
+      }, null, this.promiseLabel('Ignore fulfillment value and return model value'));
+    };
 
-    runSharedModelHook: function (payload, hookName, args) {
-      this.log(payload, "calling " + hookName + " hook");
+    HandlerInfo.prototype.runSharedModelHook = function (payload, hookName, args) {
+      this.log(payload, 'calling ' + hookName + ' hook');
 
       if (this.queryParams) {
         args.push(this.queryParams);
@@ -46170,26 +45919,25 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         result = null;
       }
 
-      return _rsvp.Promise.resolve(result, this.promiseLabel("Resolve value returned from one of the model hooks"));
-    },
+      return _rsvp.Promise.resolve(result, this.promiseLabel('Resolve value returned from one of the model hooks'));
+    };
 
-    // overridden by subclasses
-    getModel: null,
+    HandlerInfo.prototype.getModel = function () {};
 
-    checkForAbort: function (shouldContinue, promiseValue) {
-      return _rsvp.Promise.resolve(shouldContinue(), this.promiseLabel("Check for abort")).then(function () {
+    HandlerInfo.prototype.checkForAbort = function (shouldContinue, promiseValue) {
+      return _rsvp.Promise.resolve(shouldContinue(), this.promiseLabel('Check for abort')).then(function () {
         // We don't care about shouldContinue's resolve value;
         // pass along the original value passed to this fn.
         return promiseValue;
-      }, null, this.promiseLabel("Ignore fulfillment value and continue"));
-    },
+      }, null, this.promiseLabel('Ignore fulfillment value and continue'));
+    };
 
-    stashResolvedModel: function (payload, resolvedModel) {
+    HandlerInfo.prototype.stashResolvedModel = function (payload, resolvedModel) {
       payload.resolvedModels = payload.resolvedModels || {};
       payload.resolvedModels[this.name] = resolvedModel;
-    },
+    };
 
-    becomeResolved: function (payload, resolvedContext) {
+    HandlerInfo.prototype.becomeResolved = function (payload, resolvedContext) {
       var params = this.serialize(resolvedContext);
 
       if (payload) {
@@ -46204,9 +45952,9 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         handler: this.handler,
         params: params
       });
-    },
+    };
 
-    shouldSupercede: function (other) {
+    HandlerInfo.prototype.shouldSupercede = function (other) {
       // Prefer this newer handlerInfo over `other` if:
       // 1) The other one doesn't exist
       // 2) The names don't match
@@ -46219,40 +45967,57 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
       var contextsMatch = other.context === this.context;
       return other.name !== this.name || this.hasOwnProperty('context') && !contextsMatch || this.hasOwnProperty('params') && !paramsMatch(this.params, other.params);
-    }
-  };
+    };
 
-  Object.defineProperty(HandlerInfo.prototype, 'handler', {
-    get: function () {
-      // _handler could be set to either a handler object or undefined, so we
-      // compare against a default reference to know when it's been set
-      if (this._handler !== DEFAULT_HANDLER) {
-        return this._handler;
-      }
+    (0, _emberBabel.createClass)(HandlerInfo, [{
+      key: 'handler',
+      get: function () {
+        // _handler could be set to either a handler object or undefined, so we
+        // compare against a default reference to know when it's been set
+        if (this._handler !== DEFAULT_HANDLER) {
+          return this._handler;
+        }
 
-      return this.fetchHandler();
-    },
+        return this.fetchHandler();
+      },
+      set: function (handler) {
+        return this._handler = handler;
+      }
+    }, {
+      key: 'handlerPromise',
+      get: function () {
+        if (this._handlerPromise !== null) {
+          return this._handlerPromise;
+        }
 
-    set: function (handler) {
-      return this._handler = handler;
-    }
-  });
+        this.fetchHandler();
 
-  Object.defineProperty(HandlerInfo.prototype, 'handlerPromise', {
-    get: function () {
-      if (this._handlerPromise) {
         return this._handlerPromise;
-      }
-
-      this.fetchHandler();
+      },
+      set: function (handlerPromise) {
+        this._handlerPromise = handlerPromise;
 
-      return this._handlerPromise;
-    },
+        return handlerPromise;
+      }
+    }]);
+    return HandlerInfo;
+  }();
 
-    set: function (handlerPromise) {
-      return this._handlerPromise = handlerPromise;
-    }
-  });
+  // this is bonkers, we require that `context` be set on on the
+  // HandlerInfo prototype to null because the checks in
+  // `NamedTransitionIntent.prototype.applyToHandlers` here
+  // https://github.com/tildeio/router.js/blob/v1.2.8/lib/router/transition-intent/named-transition-intent.js#L76-L81
+  // check of `oldHandlerInfo.context === newHandlerInfo.context` and assumes
+  // that the params _must_ match also in that case.
+  //
+  // The only reason `oldHandlerInfo.context` and `newHandlerInfo.context` did not
+  // match in prior versions is because if the context isn't set yet (on newHandlerInfo)
+  // is because it inherits the `null` from the prototype vs `undefined` (on
+  // the oldHandlerInfo).
+  //
+  // A future refactoring should remove that conditional, and fix the hand full of
+  // failing tests.
+  HandlerInfo.prototype.context = null;
 
   function paramsMatch(a, b) {
     if (!a ^ !b) {
@@ -46276,48 +46041,55 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     return true;
   }
 
-  var ResolvedHandlerInfo = subclass(HandlerInfo, {
-    resolve: function (shouldContinue, payload) {
+  var ResolvedHandlerInfo = function (_HandlerInfo) {
+    (0, _emberBabel.inherits)(ResolvedHandlerInfo, _HandlerInfo);
+
+    function ResolvedHandlerInfo(props) {
+
+      var _this3 = (0, _emberBabel.possibleConstructorReturn)(this, _HandlerInfo.call(this, props));
+
+      _this3.isResolved = true;
+      return _this3;
+    }
+
+    ResolvedHandlerInfo.prototype.resolve = function (shouldContinue, payload) {
       // A ResolvedHandlerInfo just resolved with itself.
       if (payload && payload.resolvedModels) {
         payload.resolvedModels[this.name] = this.context;
       }
-      return _rsvp.Promise.resolve(this, this.promiseLabel("Resolve"));
-    },
+      return _rsvp.Promise.resolve(this, this.promiseLabel('Resolve'));
+    };
 
-    getUnresolved: function () {
+    ResolvedHandlerInfo.prototype.getUnresolved = function () {
       return this.factory('param', {
         name: this.name,
         handler: this.handler,
         params: this.params
       });
-    },
+    };
 
-    isResolved: true
-  });
+    return ResolvedHandlerInfo;
+  }(HandlerInfo);
 
-  var UnresolvedHandlerInfoByObject = subclass(HandlerInfo, {
-    getModel: function (payload) {
-      this.log(payload, this.name + ": resolving provided model");
-      return _rsvp.Promise.resolve(this.context);
-    },
+  var UnresolvedHandlerInfoByObject = function (_HandlerInfo2) {
+    (0, _emberBabel.inherits)(UnresolvedHandlerInfoByObject, _HandlerInfo2);
 
-    initialize: function (props) {
-      this.names = props.names || [];
-      this.context = props.context;
-    },
+    function UnresolvedHandlerInfoByObject(props) {
 
-    /**
-      @private
-       Serializes a handler using its custom `serialize` method or
-      by a default that looks up the expected property name from
-      the dynamic segment.
-       @param {Object} model the model to be serialized for this handler
-    */
-    serialize: function (_model) {
+      var _this4 = (0, _emberBabel.possibleConstructorReturn)(this, _HandlerInfo2.call(this, props));
+
+      _this4.names = _this4.names || [];
+      return _this4;
+    }
+
+    UnresolvedHandlerInfoByObject.prototype.getModel = function (payload) {
+      this.log(payload, this.name + ': resolving provided model');
+      return _rsvp.Promise.resolve(this.context);
+    };
+
+    UnresolvedHandlerInfoByObject.prototype.serialize = function (_model) {
       var model = _model || this.context,
-          names = this.names,
-          serializer = this.serializer || this.handler && this.handler.serialize;
+          names = this.names;
 
       var object = {};
       if (isParam(model)) {
@@ -46326,8 +46098,11 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       }
 
       // Use custom serialize if it exists.
-      if (serializer) {
-        return serializer(model, names);
+      if (this.serializer) {
+        // invoke this.serializer unbound (getSerializer returns a stateless function)
+        return this.serializer.call(null, model, names);
+      } else if (this.handler && this.handler.serialize) {
+        return this.handler.serialize(model, names);
       }
 
       if (names.length !== 1) {
@@ -46342,16 +46117,23 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         object[name] = model;
       }
       return object;
-    }
-  });
+    };
 
-  // Generated by URL transitions and non-dynamic route segments in named Transitions.
-  var UnresolvedHandlerInfoByParam = subclass(HandlerInfo, {
-    initialize: function (props) {
-      this.params = props.params || {};
-    },
+    return UnresolvedHandlerInfoByObject;
+  }(HandlerInfo);
+
+  var UnresolvedHandlerInfoByParam = function (_HandlerInfo3) {
+    (0, _emberBabel.inherits)(UnresolvedHandlerInfoByParam, _HandlerInfo3);
+
+    function UnresolvedHandlerInfoByParam(props) {
+
+      var _this5 = (0, _emberBabel.possibleConstructorReturn)(this, _HandlerInfo3.call(this, props));
+
+      _this5.params = _this5.params || {};
+      return _this5;
+    }
 
-    getModel: function (payload) {
+    UnresolvedHandlerInfoByParam.prototype.getModel = function (payload) {
       var fullParams = this.params;
       if (payload && payload.queryParams) {
         fullParams = {};
@@ -46363,8 +46145,10 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       var hookName = resolveHook(handler, 'deserialize') || resolveHook(handler, 'model');
 
       return this.runSharedModelHook(payload, hookName, [fullParams]);
-    }
-  });
+    };
+
+    return UnresolvedHandlerInfoByParam;
+  }(HandlerInfo);
 
   handlerInfoFactory.klasses = {
     resolved: ResolvedHandlerInfo,
@@ -46373,27 +46157,27 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   };
 
   function handlerInfoFactory(name, props) {
-    var Ctor = handlerInfoFactory.klasses[name],
-        handlerInfo = new Ctor(props || {});
+    var klass = handlerInfoFactory.klasses[name];
+    var handlerInfo = new klass(props || {});
     handlerInfo.factory = handlerInfoFactory;
     return handlerInfo;
   }
 
-  var NamedTransitionIntent = subclass(TransitionIntent, {
-    name: null,
-    pivotHandler: null,
-    contexts: null,
-    queryParams: null,
+  var NamedTransitionIntent = function (_TransitionIntent) {
+    (0, _emberBabel.inherits)(NamedTransitionIntent, _TransitionIntent);
 
-    initialize: function (props) {
-      this.name = props.name;
-      this.pivotHandler = props.pivotHandler;
-      this.contexts = props.contexts || [];
-      this.queryParams = props.queryParams;
-    },
+    function NamedTransitionIntent(props) {
 
-    applyToState: function (oldState, recognizer, getHandler, isIntermediate, getSerializer) {
+      var _this6 = (0, _emberBabel.possibleConstructorReturn)(this, _TransitionIntent.call(this, props));
 
+      _this6.name = props.name;
+      _this6.pivotHandler = props.pivotHandler;
+      _this6.contexts = props.contexts || [];
+      _this6.queryParams = props.queryParams;
+      return _this6;
+    }
+
+    NamedTransitionIntent.prototype.applyToState = function (oldState, recognizer, getHandler, isIntermediate, getSerializer) {
       var partitionedArgs = extractQueryParams([this.name].concat(this.contexts)),
           pureArgs = partitionedArgs[0],
           handlers = recognizer.handlersFor(pureArgs[0]);
@@ -46401,10 +46185,9 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       var targetRouteName = handlers[handlers.length - 1].handler;
 
       return this.applyToHandlers(oldState, handlers, getHandler, targetRouteName, isIntermediate, null, getSerializer);
-    },
-
-    applyToHandlers: function (oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive, getSerializer) {
+    };
 
+    NamedTransitionIntent.prototype.applyToHandlers = function (oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive, getSerializer) {
       var i, len, result, name, oldHandlerInfo, newHandlerInfo, serializer, oldContext, handlerToUse;
       var newState = new TransitionState();
       var objects = this.contexts.slice(0);
@@ -46475,7 +46258,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       }
 
       if (objects.length > 0) {
-        throw new Error("More context objects were passed than there are dynamic segments for the route: " + targetRouteName);
+        throw new Error('More context objects were passed than there are dynamic segments for the route: ' + targetRouteName);
       }
 
       if (!isIntermediate) {
@@ -46485,9 +46268,9 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       merge(newState.queryParams, this.queryParams || {});
 
       return newState;
-    },
+    };
 
-    invalidateChildren: function (handlerInfos, invalidateIndex) {
+    NamedTransitionIntent.prototype.invalidateChildren = function (handlerInfos, invalidateIndex) {
       var i, l, handlerInfo;
 
       for (i = invalidateIndex, l = handlerInfos.length; i < l; ++i) {
@@ -46495,12 +46278,11 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
         handlerInfos[i] = handlerInfo.getUnresolved();
       }
-    },
+    };
 
-    getHandlerInfoForDynamicSegment: function (name, getHandler, names, objects, oldHandlerInfo, targetRouteName, i, serializer) {
+    NamedTransitionIntent.prototype.getHandlerInfoForDynamicSegment = function (name, getHandler, names, objects, oldHandlerInfo, targetRouteName, i, serializer) {
       var objectToUse, preTransitionHandlerInfo;
       if (objects.length > 0) {
-
         // Use the objects provided for this transition.
         objectToUse = objects[objects.length - 1];
         if (isParam(objectToUse)) {
@@ -46535,9 +46317,9 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         context: objectToUse,
         names: names
       });
-    },
+    };
 
-    createParamHandlerInfo: function (name, getHandler, names, objects, oldHandlerInfo) {
+    NamedTransitionIntent.prototype.createParamHandlerInfo = function (name, getHandler, names, objects, oldHandlerInfo) {
       var params = {},
           oldParams,
           peek,
@@ -46546,14 +46328,13 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       // Soak up all the provided string/numbers
       var numNames = names.length;
       while (numNames--) {
-
         // Only use old params if the names match with the new handler
         oldParams = oldHandlerInfo && name === oldHandlerInfo.name && oldHandlerInfo.params || {};
         peek = objects[objects.length - 1];
         paramName = names[numNames];
 
         if (isParam(peek)) {
-          params[paramName] = "" + objects.pop();
+          params[paramName] = '' + objects.pop();
         } else {
           // If we're here, this means only some of the params
           // were string/number params, so try and use a param
@@ -46571,8 +46352,10 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         getHandler: getHandler,
         params: params
       });
-    }
-  });
+    };
+
+    return NamedTransitionIntent;
+  }(TransitionIntent);
 
   function UnrecognizedURLError(message) {
     if (!(this instanceof UnrecognizedURLError)) {
@@ -46596,16 +46379,20 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     this.code = error.code;
   }
 
-  UnrecognizedURLError.prototype = oCreate(Error.prototype);
+  UnrecognizedURLError.prototype = Object.create(Error.prototype);
 
-  var URLTransitionIntent = subclass(TransitionIntent, {
-    url: null,
+  var URLTransitionIntent = function (_TransitionIntent2) {
+    (0, _emberBabel.inherits)(URLTransitionIntent, _TransitionIntent2);
 
-    initialize: function (props) {
-      this.url = props.url;
-    },
+    function URLTransitionIntent(props) {
+
+      var _this7 = (0, _emberBabel.possibleConstructorReturn)(this, _TransitionIntent2.call(this, props));
+
+      _this7.url = props.url;
+      return _this7;
+    }
 
-    applyToState: function (oldState, recognizer, getHandler) {
+    URLTransitionIntent.prototype.applyToState = function (oldState, recognizer, getHandler) {
       var newState = new TransitionState(),
           result,
           name,
@@ -46667,12 +46454,14 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       merge(newState.queryParams, results.queryParams);
 
       return newState;
-    }
-  });
+    };
+
+    return URLTransitionIntent;
+  }(TransitionIntent);
 
   var pop = Array.prototype.pop;
 
-  function Router$1(_options) {
+  function Router(_options) {
     var options = _options || {};
     this.getHandler = options.getHandler || this.getHandler;
     this.getSerializer = options.getSerializer || this.getSerializer;
@@ -46689,7 +46478,6 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     this._changedQueryParams = undefined;
     this.oldState = undefined;
     this.currentHandlerInfos = undefined;
-    this.state = undefined;
     this.currentSequence = 0;
 
     this.recognizer = new _routeRecognizer.default();
@@ -46705,7 +46493,6 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
 
     if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
-
       // This is a no-op transition. See if query params changed.
       if (queryParamChangelist) {
         newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
@@ -46744,7 +46531,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     // after the transition has been finalized.
     newTransition.promise = newTransition.promise.then(function (result) {
       return finalizeTransition(newTransition, result.state);
-    }, null, promiseLabel("Settle transition promise when transition is finalized"));
+    }, null, _promiseLabel('Settle transition promise when transition is finalized'));
 
     if (!wasTransitioning) {
       notifyExistingHandlers(this, newState, newTransition);
@@ -46755,8 +46542,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     return newTransition;
   }
 
-  Router$1.prototype = {
-
+  Router.prototype = {
     /**
       The main entry point into the router. The API is essentially
       the same as the `map` method in `route-recognizer`.
@@ -46817,7 +46603,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
             router.didTransition(router.currentHandlerInfos);
           }
           return result;
-        }, null, promiseLabel("Transition complete"));
+        }, null, _promiseLabel('Transition complete'));
         return newTransition;
       }
     },
@@ -46878,7 +46664,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
        @param {String} url a URL to update to
     */
     updateURL: function () {
-      throw new Error("updateURL is not implemented");
+      throw new Error('updateURL is not implemented');
     },
 
     /**
@@ -46905,20 +46691,11 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
     },
 
     refresh: function (pivotHandler) {
-      var previousTransition = this.activeTransition,
-          i,
-          len,
-          handlerInfo;
+      var previousTransition = this.activeTransition;
       var state = previousTransition ? previousTransition.state : this.state;
       var handlerInfos = state.handlerInfos;
-      var params = {};
-      for (i = 0, len = handlerInfos.length; i < len; ++i) {
-        handlerInfo = handlerInfos[i];
 
-        params[handlerInfo.name] = handlerInfo.params || {};
-      }
-
-      log(this, "Starting a refresh transition");
+      _log(this, 'Starting a refresh transition');
       var intent = new NamedTransitionIntent({
         name: handlerInfos[handlerInfos.length - 1].name,
         pivotHandler: pivotHandler || handlerInfos[0].handler,
@@ -46955,7 +46732,6 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
        @return {String} a URL
     */
     generate: function (handlerName) {
-
       var partitionedArgs = extractQueryParams(slice.call(arguments, 1)),
           suppliedParams = partitionedArgs[0],
           queryParams = partitionedArgs[1],
@@ -46966,7 +46742,10 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
       // Construct a TransitionIntent with the provided params
       // and apply it to the present state of the router.
-      var intent = new NamedTransitionIntent({ name: handlerName, contexts: suppliedParams });
+      var intent = new NamedTransitionIntent({
+        name: handlerName,
+        contexts: suppliedParams
+      });
       var state = intent.applyToState(this.state, this.recognizer, this.getHandler, null, this.getSerializer);
       var params = {};
 
@@ -47054,7 +46833,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
     trigger: function () /*name*/{
       var args = slice.call(arguments);
-      trigger(this, this.currentHandlerInfos, false, args);
+      _trigger(this, this.currentHandlerInfos, false, args);
     },
 
     /**
@@ -47072,12 +46851,11 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   function fireQueryParamDidChange(router, newState, queryParamChangelist) {
     // If queryParams changed trigger event
     if (queryParamChangelist) {
-
       // This is a little hacky but we need some way of storing
       // changed query params given that no activeTransition
       // is guaranteed to have occurred.
       router._changedQueryParams = queryParamChangelist.all;
-      trigger(router, newState.handlerInfos, true, ['queryParamsDidChange', queryParamChangelist.changed, queryParamChangelist.all, queryParamChangelist.removed]);
+      _trigger(router, newState.handlerInfos, true, ['queryParamsDidChange', queryParamChangelist.changed, queryParamChangelist.all, queryParamChangelist.removed]);
       router._changedQueryParams = null;
     }
   }
@@ -47366,9 +47144,8 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   function finalizeTransition(transition, newState) {
     var router, handlerInfos, infos;
 
-
     try {
-      log(transition.router, transition.sequence, "Resolved all models on destination route; finalizing transition.");
+      _log(transition.router, transition.sequence, 'Resolved all models on destination route; finalizing transition.');
 
       router = transition.router, handlerInfos = newState.handlerInfos;
 
@@ -47388,13 +47165,13 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       transition.isActive = false;
       router.activeTransition = null;
 
-      trigger(router, router.currentHandlerInfos, true, ['didTransition']);
+      _trigger(router, router.currentHandlerInfos, true, ['didTransition']);
 
       if (router.didTransition) {
         router.didTransition(router.currentHandlerInfos);
       }
 
-      log(router, transition.sequence, "TRANSITION COMPLETE.");
+      _log(router, transition.sequence, 'TRANSITION COMPLETE.');
 
       // Resolve with the final handler.
       return handlerInfos[handlerInfos.length - 1].handler;
@@ -47435,8 +47212,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
 
     var intent;
     if (args.length === 0) {
-
-      log(router, "Updating query params");
+      _log(router, 'Updating query params');
 
       // A query param update is really just a transition
       // into the route you're already on.
@@ -47448,12 +47224,10 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         queryParams: queryParams
       });
     } else if (name.charAt(0) === '/') {
-
-      log(router, "Attempting URL transition to " + name);
+      _log(router, 'Attempting URL transition to ' + name);
       intent = new URLTransitionIntent({ url: name });
     } else {
-
-      log(router, "Attempting transition to " + name);
+      _log(router, 'Attempting transition to ' + name);
       intent = new NamedTransitionIntent({
         name: args[0],
         contexts: slice.call(args, 1),
@@ -47546,7 +47320,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
         i,
         len,
         qp;
-    trigger(router, resolvedHandlers, true, ['finalizeQueryParamChange', newQueryParams, finalQueryParamsArray, transition]);
+    _trigger(router, resolvedHandlers, true, ['finalizeQueryParamChange', newQueryParams, finalQueryParamsArray, transition]);
 
     if (transition) {
       transition._visibleQueryParams = {};
@@ -47567,8 +47341,6 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   function notifyExistingHandlers(router, newState, newTransition) {
     var oldHandlers = router.state.handlerInfos,
         changing = [],
-        leavingIndex = null,
-        leaving,
         i,
         oldHandlerLen,
         oldHandler,
@@ -47580,7 +47352,6 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       newHandler = newState.handlerInfos[i];
 
       if (!newHandler || oldHandler.name !== newHandler.name) {
-        leavingIndex = i;
         break;
       }
 
@@ -47589,11 +47360,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
       }
     }
 
-    if (leavingIndex !== null) {
-      leaving = oldHandlers.slice(leavingIndex, oldHandlerLen);
-    }
-
-    trigger(router, oldHandlers, true, ['willTransition', newTransition]);
+    _trigger(router, oldHandlers, true, ['willTransition', newTransition]);
 
     if (router.willTransition) {
       router.willTransition(oldHandlers, newState.handlerInfos, newTransition);
@@ -47601,7 +47368,7 @@ enifed('router', ['exports', 'route-recognizer', 'rsvp'], function (exports, _ro
   }
 
   exports.Transition = Transition;
-  exports.default = Router$1;
+  exports.default = Router;
 });
 enifed('rsvp', ['exports', 'ember-babel', 'node-module'], function (exports, _emberBabel, _nodeModule) {
   'use strict';