ember-source 4.4.0-alpha.1 → 4.4.0-alpha.2

package/dist/ember.debug.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   4.4.0-alpha.1
+ * @version   4.4.0-alpha.2
  */
 /* eslint-disable no-var */
 
@@ -335,8 +335,6 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
       @public
      @method factoryFor
      @param {String} fullName
-     @param {Object} [options]
-     @param {String} [options.source] The fullname of the request source (used for local lookup)
      @return {any}
      */
 
@@ -347,7 +345,9 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
       }
 
       var normalizedName = this.registry.normalize(fullName);
-      (true && !(this.registry.isValidFullName(normalizedName)) && (0, _debug.assert)('fullName must be a proper full name', this.registry.isValidFullName(normalizedName)));
+      (true && !(this.registry.isValidFullName(normalizedName)) && (0, _debug.assert)('fullName must be a proper full name', this.registry.isValidFullName(normalizedName))); // TODO: This needs to return a Factory to be compatible with Owner.
+      // We should correctly the types so that this cast is not necessary.
+
       return factoryFor(this, normalizedName, fullName);
     }
 
@@ -2142,7 +2142,7 @@ define("@ember/-internals/extension-support/lib/data_adapter", ["exports", "@emb
 
   _exports.default = _default;
 });
-define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler", "@ember/-internals/owner", "@ember/-internals/utils", "@ember/debug", "@glimmer/manager", "@glimmer/reference", "@glimmer/validator", "@ember/-internals/metal", "@ember/object", "@ember/-internals/browser-environment", "@ember/-internals/views", "@ember/engine", "@ember/instrumentation", "@ember/service", "@ember/string", "@glimmer/destroyable", "@ember/runloop", "@glimmer/util", "@glimmer/runtime", "@ember/-internals/runtime", "@ember/-internals/environment", "@ember/-internals/container", "@glimmer/node", "@ember/-internals/glimmer", "@glimmer/global-context", "@ember/-internals/routing", "@glimmer/program", "rsvp"], function (_exports, _opcodeCompiler, _owner2, _utils, _debug, _manager2, _reference, _validator, _metal, _object, _browserEnvironment, _views, _engine, _instrumentation, _service, _string, _destroyable, _runloop, _util, _runtime, _runtime2, _environment2, _container, _node, _glimmer, _globalContext, _routing2, _program, _rsvp) {
+define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler", "@ember/-internals/owner", "@ember/-internals/utils", "@ember/debug", "@glimmer/manager", "@glimmer/reference", "@glimmer/validator", "@ember/-internals/metal", "@ember/object", "@ember/-internals/browser-environment", "@ember/-internals/views", "@ember/engine", "@ember/engine/instance", "@ember/instrumentation", "@ember/service", "@ember/string", "@glimmer/destroyable", "@ember/runloop", "@glimmer/util", "@glimmer/runtime", "@ember/-internals/runtime", "@ember/-internals/environment", "@ember/-internals/container", "@glimmer/node", "@ember/-internals/glimmer", "@glimmer/global-context", "@ember/-internals/routing", "@glimmer/program", "rsvp"], function (_exports, _opcodeCompiler, _owner2, _utils, _debug, _manager2, _reference, _validator, _metal, _object, _browserEnvironment, _views, _engine, _instance, _instrumentation, _service, _string, _destroyable, _runloop, _util, _runtime, _runtime2, _environment2, _container, _node, _glimmer, _globalContext, _routing2, _program, _rsvp) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -3284,11 +3284,13 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     }
 
     get isEngine() {
-      return (0, _engine.getEngineParent)(this.owner) !== undefined;
+      var owner = this.owner;
+      return owner instanceof _instance.default && (0, _engine.getEngineParent)(owner) !== undefined;
     }
 
     get engineMountPoint() {
-      return this.owner.mountPoint;
+      var owner = this.owner;
+      return owner instanceof _instance.default ? owner.mountPoint : undefined;
     }
 
     classFor(state) {
@@ -5411,6 +5413,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
 
         if (owner.lookup('-environment:main').isInteractive) {
           this.__dispatcher = owner.lookup('event_dispatcher:main');
+          (true && !(this.__dispatcher instanceof _views.EventDispatcher) && (0, _debug.assert)('Expected dispatcher to be an EventDispatcher', this.__dispatcher instanceof _views.EventDispatcher));
         } else {
           // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
           this.__dispatcher = null;
@@ -6045,11 +6048,9 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
         var currentOwner = (0, _reference.valueForRef)(currentStateRef).render.owner;
 
         if (parentOwner && parentOwner !== currentOwner) {
-          var engine = currentOwner;
-          (true && !(typeof currentOwner.mountPoint === 'string') && (0, _debug.assert)('invalid engine: missing mountPoint', typeof currentOwner.mountPoint === 'string'));
-          (true && !(currentOwner.routable === true) && (0, _debug.assert)('invalid engine: missing routable', currentOwner.routable === true));
-          var mountPoint = engine.mountPoint;
-          state.engine = engine;
+          (true && !(currentOwner instanceof _instance.default) && (0, _debug.assert)('Expected currentOwner to be an EngineInstance', currentOwner instanceof _instance.default));
+          var mountPoint = currentOwner.mountPoint;
+          state.engine = currentOwner;
           state.engineBucket = {
             mountPoint
           };
@@ -6853,7 +6854,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     (true && !(typeof original === 'string') && (0, _debug.assert)('[BUG] expecting a string literal for the `original` argument', typeof original === 'string'));
     return (0, _reference.createComputeRef)(() => {
       var nameOrValue = (0, _reference.valueForRef)(nameOrValueRef);
-      (true && !(typeof nameOrValue !== 'string') && (0, _debug.assert)(`Passing a dynamic string to the \`(${type})\` keyword is disallowed. ` + `(You specified \`(${type} ${original})\` and \`${original}\` evaluated into "${nameOrValue}".) ` + `This ensures we can statically analyze the template and determine which ${type}s are used. ` + `If the ${type} name is always the same, use a string literal instead, i.e. \`(${type} "${nameOrValue}")\`. ` + `Otherwise, import the ${type}s into JavaScript and pass them to the ${type} keyword. ` + 'See https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#4-no-dynamic-resolution for details. ' + loc, typeof nameOrValue !== 'string'));
+      (true && !(typeof nameOrValue !== 'string') && (0, _debug.assert)(`Passing a dynamic string to the \`(${type})\` keyword is disallowed. ` + `(You specified \`(${type} ${original})\` and \`${original}\` evaluated into "${nameOrValue}".) ` + `This ensures we can statically analyze the template and determine which ${type}s are used. ` + `If the ${type} name is always the same, use a string literal instead, i.e. \`(${type} "${nameOrValue}")\`. ` + `Otherwise, import the ${type}s into JavaScript and pass them directly. ` + 'See https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#4-no-dynamic-resolution for details. ' + loc, typeof nameOrValue !== 'string'));
       return nameOrValue;
     });
   });
@@ -7453,6 +7454,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
 
     ensureEventSetup(actionState) {
       var dispatcher = actionState.owner.lookup('event_dispatcher:main');
+      (true && !(dispatcher instanceof _views.EventDispatcher) && (0, _debug.assert)('Expected dispatcher to be an EventDispatcher', dispatcher instanceof _views.EventDispatcher));
       dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.setupHandlerForEmberEvent(actionState.eventName);
     }
 
@@ -7506,6 +7508,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       // mount is a runtime helper, this shouldn't use dynamic layout
       // we should resolve the engine app template in the helper
       // it also should use the owner that looked up the mount helper.
+      (true && !(owner instanceof _instance.default) && (0, _debug.assert)('Expected owner to be an EngineInstance', owner instanceof _instance.default));
       var engine = owner.buildChildEngineInstance(name);
       engine.boot();
       var applicationFactory = engine.factoryFor(`controller:application`);
@@ -7722,28 +7725,17 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     Note: Your content __will not render__ if there isn't an `{{outlet}}` for it.
   
     @method outlet
-    @param {String} [name]
     @for Ember.Templates.helpers
     @public
   */
 
-  var outletHelper = internalHelper((args, owner, scope) => {
+  var outletHelper = internalHelper((_args, owner, scope) => {
     (true && !(owner) && (0, _debug.assert)('Expected owner to be present, {{outlet}} requires an owner', owner));
     (true && !(scope) && (0, _debug.assert)('Expected dynamic scope to be present. You may have attempted to use the {{outlet}} keyword dynamically. This keyword cannot be used dynamically.', scope));
-    var nameRef;
-
-    if (args.positional.length === 0) {
-      nameRef = (0, _reference.createPrimitiveRef)('main');
-    } else {
-      var maybeNameRef = args.positional[0];
-      (true && !(maybeNameRef) && (0, _debug.assert)('Expected at least one positional arg', maybeNameRef));
-      nameRef = maybeNameRef;
-    }
-
     var outletRef = (0, _reference.createComputeRef)(() => {
       var state = (0, _reference.valueForRef)(scope.get('outletState'));
       var outlets = state !== undefined ? state.outlets : undefined;
-      return outlets !== undefined ? outlets[(0, _reference.valueForRef)(nameRef)] : undefined;
+      return outlets !== undefined ? outlets.main : undefined;
     });
     var lastState = null;
     var definition = null;
@@ -7782,11 +7774,10 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
             named.model = (0, _reference.createDebugAliasRef)('@model', named.model);
           }
 
-          var _args2 = (0, _runtime.createCapturedArgs)(named, _runtime.EMPTY_POSITIONAL);
-
+          var args = (0, _runtime.createCapturedArgs)(named, _runtime.EMPTY_POSITIONAL);
           definition = (0, _runtime.curry)(0
           /* Component */
-          , new OutletComponentDefinition(state), (_b = (_a = outletState === null || outletState === void 0 ? void 0 : outletState.render) === null || _a === void 0 ? void 0 : _a.owner) !== null && _b !== void 0 ? _b : owner, _args2, true);
+          , new OutletComponentDefinition(state), (_b = (_a = outletState === null || outletState === void 0 ? void 0 : outletState.render) === null || _a === void 0 ? void 0 : _a.owner) !== null && _b !== void 0 ? _b : owner, args, true);
         } else {
           definition = null;
         }
@@ -7836,9 +7827,9 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     };
   }
 
-  function componentFor(name, owner, options) {
+  function componentFor(name, owner) {
     var fullName = `component:${name}`;
-    return owner.factoryFor(fullName, options) || null;
+    return owner.factoryFor(fullName) || null;
   }
 
   function layoutFor(name, owner, options) {
@@ -7847,7 +7838,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
   }
 
   function lookupComponentPair(owner, name, options) {
-    var component = componentFor(name, owner, options);
+    var component = componentFor(name, owner);
 
     if (component !== null && component.class !== undefined) {
       var _layout = (0, _manager2.getComponentTemplate)(component.class);
@@ -11536,13 +11527,13 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
   }
 
   function _getProp(obj, keyName) {
-    var type = typeof obj;
-    var isObject$$1 = type === 'object';
-    var isFunction = type === 'function';
-    var isObjectLike = isObject$$1 || isFunction;
+    if (obj == null) {
+      return;
+    }
+
     var value;
 
-    if (isObjectLike) {
+    if (typeof obj === 'object' || typeof obj === 'function') {
       if (true
       /* DEBUG */
       ) {
@@ -11551,7 +11542,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
         value = obj[keyName];
       }
 
-      if (value === undefined && isObject$$1 && !(keyName in obj) && typeof obj.unknownProperty === 'function') {
+      if (value === undefined && typeof obj === 'object' && !(keyName in obj) && typeof obj.unknownProperty === 'function') {
         value = obj.unknownProperty(keyName);
       }
 
@@ -11565,14 +11556,14 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
         }
       }
     } else {
+      // SAFETY: It should be ok to access properties on any non-nullish value
       value = obj[keyName];
     }
 
     return value;
   }
 
-  function _getPath(root, path) {
-    var obj = root;
+  function _getPath(obj, path) {
     var parts = typeof path === 'string' ? path.split('.') : path;
 
     for (var part of parts) {
@@ -11595,12 +11586,12 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
   _getProp({}, 1);
 
   _getProp({
-    unkonwnProperty() {}
+    unknownProperty() {}
 
   }, 'a');
 
   _getProp({
-    unkonwnProperty() {}
+    unknownProperty() {}
 
   }, 1);
 
@@ -11968,13 +11959,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
       if (typeof size === 'number') {
         return !size;
       }
-    }
-
-    if (typeof obj.length === 'number' && objectType !== 'function') {
-      return !obj.length;
-    }
 
-    if (objectType === 'object') {
       var length = get(obj, 'length');
 
       if (typeof length === 'number') {
@@ -11982,6 +11967,10 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
       }
     }
 
+    if (typeof obj.length === 'number' && objectType !== 'function') {
+      return !obj.length;
+    }
+
     return false;
   }
   /**
@@ -14985,7 +14974,7 @@ define("@ember/-internals/routing/lib/location/util", ["exports"], function (_ex
     location.replace(getOrigin(location) + path);
   }
 });
-define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-internals/owner", "@ember/-internals/runtime", "@ember/-internals/utils", "@ember/debug", "@ember/object/computed", "@ember/service", "@glimmer/validator", "@ember/-internals/routing/lib/utils"], function (_exports, _owner, _runtime, _utils, _debug, _computed, _service, _validator, _utils2) {
+define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-internals/owner", "@ember/-internals/runtime", "@ember/-internals/utils", "@ember/debug", "@ember/object/computed", "@ember/service", "@glimmer/validator", "@ember/-internals/routing/lib/system/router", "@ember/-internals/routing/lib/utils"], function (_exports, _owner, _runtime, _utils, _debug, _computed, _service, _validator, _router, _utils2) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -15122,6 +15111,7 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
       var owner = (0, _owner.getOwner)(this);
       (true && !(owner) && (0, _debug.assert)('RouterService is unexpectedly missing an owner', owner));
       router = owner.lookup('router:main');
+      (true && !(router instanceof _router.default) && (0, _debug.assert)('ROUTER SERVICE BUG: Expected router to be an instance of EmberRouter', router instanceof _router.default));
       return this[ROUTER] = router;
     }
 
@@ -15455,7 +15445,7 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
 
   __decorate([(0, _computed.readOnly)('_router.currentRoute')], RouterService.prototype, "currentRoute", void 0);
 });
-define("@ember/-internals/routing/lib/services/routing", ["exports", "@ember/-internals/owner", "@ember/-internals/utils", "@ember/debug", "@ember/object/computed", "@ember/service"], function (_exports, _owner, _utils, _debug, _computed, _service) {
+define("@ember/-internals/routing/lib/services/routing", ["exports", "@ember/-internals/owner", "@ember/-internals/utils", "@ember/debug", "@ember/object/computed", "@ember/service", "@ember/-internals/routing/lib/system/router"], function (_exports, _owner, _utils, _debug, _computed, _service, _router) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -15489,6 +15479,7 @@ define("@ember/-internals/routing/lib/services/routing", ["exports", "@ember/-in
       var owner = (0, _owner.getOwner)(this);
       (true && !(owner) && (0, _debug.assert)('RoutingService is unexpectedly missing an owner', owner));
       router = owner.lookup('router:main');
+      (true && !(router instanceof _router.default) && (0, _debug.assert)('ROUTING SERVICE BUG: Expected router to be an instance of EmberRouter', router instanceof _router.default));
       router.setupRouter();
       return this[ROUTER] = router;
     }
@@ -15912,7 +15903,7 @@ define("@ember/-internals/routing/lib/system/engines", ["exports"], function (_e
     value: true
   });
 });
-define("@ember/-internals/routing/lib/system/generate_controller", ["exports", "@ember/-internals/metal", "@ember/debug"], function (_exports, _metal, _debug) {
+define("@ember/-internals/routing/lib/system/generate_controller", ["exports", "@ember/-internals/metal", "@ember/controller", "@ember/debug"], function (_exports, _metal, _controller, _debug) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -15959,6 +15950,7 @@ define("@ember/-internals/routing/lib/system/generate_controller", ["exports", "
     generateControllerFactory(owner, controllerName);
     var fullName = `controller:${controllerName}`;
     var instance = owner.lookup(fullName);
+    (true && !(instance instanceof _controller.default) && (0, _debug.assert)('Expected an instance of controller', instance instanceof _controller.default));
 
     if (true
     /* DEBUG */
@@ -16002,7 +15994,7 @@ define("@ember/-internals/routing/lib/system/route-info", ["exports"], function
     value: true
   });
 });
-define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-internals/container", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/-internals/runtime", "@ember/-internals/utils", "@ember/debug", "@ember/object/compat", "@ember/runloop", "router_js", "@ember/-internals/routing/lib/utils", "@ember/-internals/routing/lib/system/generate_controller"], function (_exports, _container, _metal, _owner, _runtime, _utils, _debug, _compat, _runloop, _router_js, _utils2, _generate_controller) {
+define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-internals/container", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/-internals/routing", "@ember/-internals/runtime", "@ember/-internals/utils", "@ember/controller", "@ember/debug", "@ember/engine/instance", "@ember/object/compat", "@ember/runloop", "router_js", "@ember/-internals/routing/lib/utils", "@ember/-internals/routing/lib/system/generate_controller", "@ember/-internals/routing/lib/system/router"], function (_exports, _container, _metal, _owner, _routing, _runtime, _utils, _controller2, _debug, _instance, _compat, _runloop, _router_js, _utils2, _generate_controller, _router) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -16028,13 +16020,13 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
 
   class Route extends _runtime.Object.extend(_runtime.ActionHandler, _runtime.Evented) {
     constructor(owner) {
-      super(...arguments);
+      super(owner);
       this.context = {};
 
       if (owner) {
         var router = owner.lookup('router:main');
         var bucketCache = owner.lookup((0, _container.privatize)`-bucket-cache:main`);
-        (true && !(router && bucketCache) && (0, _debug.assert)('ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!', router && bucketCache));
+        (true && !(router instanceof _router.default && bucketCache instanceof _routing.BucketCache) && (0, _debug.assert)('ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!', router instanceof _router.default && bucketCache instanceof _routing.BucketCache));
         this._router = router;
         this._bucketCache = bucketCache;
         this._topLevelViewTemplate = owner.lookup('template:-outlet');
@@ -16115,7 +16107,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
     _setRouteName(name) {
       this.routeName = name;
       var owner = (0, _owner.getOwner)(this);
-      (true && !(owner) && (0, _debug.assert)('Route is unexpectedly missing an owner', owner));
+      (true && !(owner instanceof _instance.default) && (0, _debug.assert)('Expected route to have EngineInstance as owner', owner instanceof _instance.default));
       this.fullRouteName = getEngineRouteName(owner, name);
     }
     /**
@@ -16967,6 +16959,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
       //   passed a model to skip the assertion.
 
       (true && !(controller !== undefined || _skipAssert === true) && (0, _debug.assert)(`The controller named '${name}' could not be found. Make sure that this route exists and has already been entered at least once. If you are accessing a controller not associated with a route, make sure the controller class is explicitly defined.`, controller !== undefined || _skipAssert === true));
+      (true && !(controller === undefined || controller instanceof _controller2.default) && (0, _debug.assert)(`Expected controller:${name} to be an instance of Controller`, controller === undefined || controller instanceof _controller2.default));
       return controller;
     }
     /**
@@ -17031,7 +17024,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
     modelFor(_name) {
       var name;
       var owner = (0, _owner.getOwner)(this);
-      (true && !(owner) && (0, _debug.assert)('Route is unexpectedly missing an owner', owner));
+      (true && !(owner instanceof _instance.default) && (0, _debug.assert)('Expected router owner to be an EngineInstance', owner instanceof _instance.default));
       var transition = this._router && this._router._routerMicrolib ? this._router._routerMicrolib.activeTransition : undefined; // Only change the route name when there is an active transition.
       // Otherwise, use the passed in route name.
 
@@ -17159,10 +17152,11 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
       var hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
 
       if (controller) {
-        // the developer has authored a controller class in their application for
+        (true && !(controller instanceof _controller2.default) && (0, _debug.assert)('Expected an instance of controller', controller instanceof _controller2.default)); // the developer has authored a controller class in their application for
         // this route find its query params and normalize their object shape them
         // merge in the query params for the route. As a mergedProperty,
         // Route#queryParams is always at least `{}`
+
         var controllerDefinedQueryParameterConfiguration = (0, _metal.get)(controller, 'queryParams') || [];
         var normalizedControllerQueryParameterConfiguration = (0, _utils2.normalizeControllerQueryParams)(controllerDefinedQueryParameterConfiguration);
         combinedQueryParameterConfiguration = mergeEachQueryParams(normalizedControllerQueryParameterConfiguration, queryParameterConfiguraton);
@@ -17326,7 +17320,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
     var owner = (0, _owner.getOwner)(route);
     (true && !(owner) && (0, _debug.assert)('Route is unexpectedly missing an owner', owner));
     var name, templateName, into, outlet, model;
-    var controller = undefined;
+    var controller;
 
     if (options) {
       into = options.into && options.into.replace(/\//g, '.');
@@ -17359,6 +17353,8 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
       (true && !(isDefaultRender || controller !== undefined) && (0, _debug.assert)(`You passed \`controller: '${controllerName}'\` into the \`render\` method, but no such controller could be found.`, isDefaultRender || controller !== undefined));
     }
 
+    (true && !(controller instanceof _controller2.default) && (0, _debug.assert)('Expected an instance of controller', controller instanceof _controller2.default));
+
     if (model === undefined) {
       model = route.currentModel;
     } else {
@@ -17727,7 +17723,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
   var _default = Route;
   _exports.default = _default;
 });
-define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-internals/container", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/-internals/runtime", "@ember/debug", "@ember/error", "@ember/runloop", "@ember/-internals/routing/lib/location/api", "@ember/-internals/routing/lib/utils", "@ember/-internals/routing/lib/system/dsl", "@ember/-internals/routing/lib/system/route", "@ember/-internals/routing/lib/system/router_state", "router_js"], function (_exports, _container, _metal, _owner, _runtime, _debug, _error2, _runloop, _api, _utils, _dsl, _route, _router_state, _router_js) {
+define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-internals/container", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/-internals/routing", "@ember/-internals/runtime", "@ember/debug", "@ember/error", "@ember/runloop", "@ember/-internals/routing/lib/location/api", "@ember/-internals/routing/lib/utils", "@ember/-internals/routing/lib/system/dsl", "@ember/-internals/routing/lib/system/route", "@ember/-internals/routing/lib/system/router_state", "router_js", "@ember/engine/instance"], function (_exports, _container, _metal, _owner, _routing, _runtime, _debug, _error2, _runloop, _api, _utils, _dsl, _route, _router_state, _router_js, _instance) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -17805,7 +17801,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
 
   class EmberRouter extends _runtime.Object.extend(_runtime.Evented) {
     constructor(owner) {
-      super(...arguments);
+      super(owner);
       this._didSetupRouter = false;
       this._initialTransitionStarted = false;
       this.currentURL = null;
@@ -17827,7 +17823,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
 
       this.namespace = owner.lookup('application:main');
       var bucketCache = owner.lookup((0, _container.privatize)`-bucket-cache:main`);
-      (true && !(bucketCache !== undefined) && (0, _debug.assert)('BUG: BucketCache should always be present', bucketCache !== undefined));
+      (true && !(bucketCache instanceof _routing.BucketCache) && (0, _debug.assert)('BUG: BucketCache should always be present', bucketCache instanceof _routing.BucketCache));
       this._bucketCache = bucketCache;
       var routerService = owner.lookup('service:router');
       (true && !(routerService !== undefined) && (0, _debug.assert)('BUG: RouterService should always be present', routerService !== undefined));
@@ -18992,7 +18988,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
 
       if (!engineInstance) {
         var owner = (0, _owner.getOwner)(this);
-        (true && !(owner) && (0, _debug.assert)('Router is unexpectedly missing an owner', owner));
+        (true && !(owner instanceof _instance.default) && (0, _debug.assert)('Expected router to have EngineInstance as owner', owner instanceof _instance.default));
         (true && !(owner.hasRegistration(`engine:${name}`)) && (0, _debug.assert)(`You attempted to mount the engine '${name}' in your router map, but the engine can not be found.`, owner.hasRegistration(`engine:${name}`)));
         engineInstance = owner.buildChildEngineInstance(name, {
           routable: true,
@@ -19297,16 +19293,6 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
     (0, _metal.set)(router, 'currentPath', path);
     (0, _metal.set)(router, 'currentRouteName', currentRouteName);
     (0, _metal.set)(router, 'currentURL', currentURL);
-    var owner = (0, _owner.getOwner)(router);
-    (true && !(owner) && (0, _debug.assert)('Router is unexpectedly missing an owner', owner));
-    var appController = owner.lookup('controller:application');
-
-    if (!appController) {
-      // appController might not exist when top-level loading/error
-      // substates have been entered since ApplicationRoute hasn't
-      // actually been entered at that point.
-      return;
-    }
   }
 
   function didBeginTransition(transition, router) {
@@ -19670,7 +19656,7 @@ define("@ember/-internals/routing/lib/system/transition", [], function () {
     @type {Transition | undefined}
   */
 });
-define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/debug", "@ember/error", "router_js"], function (_exports, _metal, _owner, _debug, _error, _router_js) {
+define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/debug", "@ember/engine/instance", "@ember/error", "router_js"], function (_exports, _metal, _owner, _debug, _instance, _error, _router_js) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -19910,7 +19896,7 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
   function prefixRouteNameArg(route, args) {
     var routeName;
     var owner = (0, _owner.getOwner)(route);
-    (true && !(owner) && (0, _debug.assert)('Route is unexpectedly missing an owner', owner));
+    (true && !(owner instanceof _instance.default) && (0, _debug.assert)('Expected route to have EngineInstance as owner', owner instanceof _instance.default));
     var prefix = owner.mountPoint; // only alter the routeName if it's actually referencing a route.
 
     if (owner.routable && typeof args[0] === 'string') {
@@ -22485,7 +22471,7 @@ define("@ember/-internals/runtime/lib/mixins/container_proxy", ["exports", "@emb
   var containerProxyMixin = {
     /**
      The container stores state.
-        @private
+      @private
      @property {Ember.Container} __container__
      */
     __container__: null,
@@ -22493,16 +22479,16 @@ define("@ember/-internals/runtime/lib/mixins/container_proxy", ["exports", "@emb
     /**
      Returns an object that can be used to provide an owner to a
      manually created instance.
-        Example:
-        ```
+      Example:
+      ```
      import { getOwner } from '@ember/application';
-        let owner = getOwner(this);
-        User.create(
+      let owner = getOwner(this);
+      User.create(
        owner.ownerInjection(),
        { username: 'rwjblue' }
      )
      ```
-        @public
+      @public
      @method ownerInjection
      @since 2.3.0
      @return {Object}
@@ -22513,30 +22499,30 @@ define("@ember/-internals/runtime/lib/mixins/container_proxy", ["exports", "@emb
 
     /**
      Given a fullName return a corresponding instance.
-        The default behavior is for lookup to return a singleton instance.
+      The default behavior is for lookup to return a singleton instance.
      The singleton is scoped to the container, allowing multiple containers
      to all have their own locally scoped singletons.
-        ```javascript
+      ```javascript
      let registry = new Registry();
      let container = registry.container();
-        registry.register('api:twitter', Twitter);
-        let twitter = container.lookup('api:twitter');
-        twitter instanceof Twitter; // => true
-        // by default the container will return singletons
+      registry.register('api:twitter', Twitter);
+      let twitter = container.lookup('api:twitter');
+      twitter instanceof Twitter; // => true
+      // by default the container will return singletons
      let twitter2 = container.lookup('api:twitter');
      twitter2 instanceof Twitter; // => true
-        twitter === twitter2; //=> true
+      twitter === twitter2; //=> true
      ```
-        If singletons are not wanted an optional flag can be provided at lookup.
-        ```javascript
+      If singletons are not wanted an optional flag can be provided at lookup.
+      ```javascript
      let registry = new Registry();
      let container = registry.container();
-        registry.register('api:twitter', Twitter);
-        let twitter = container.lookup('api:twitter', { singleton: false });
+      registry.register('api:twitter', Twitter);
+      let twitter = container.lookup('api:twitter', { singleton: false });
      let twitter2 = container.lookup('api:twitter', { singleton: false });
-        twitter === twitter2; //=> false
+      twitter === twitter2; //=> false
      ```
-        @public
+      @public
      @method lookup
      @param {String} fullName
      @param {Object} options
@@ -22561,32 +22547,32 @@ define("@ember/-internals/runtime/lib/mixins/container_proxy", ["exports", "@emb
 
     /**
     Given a fullName return a factory manager.
-       This method returns a manager which can be used for introspection of the
+     This method returns a manager which can be used for introspection of the
     factory's class or for the creation of factory instances with initial
     properties. The manager is an object with the following properties:
-       * `class` - The registered or resolved class.
+     * `class` - The registered or resolved class.
     * `create` - A function that will create an instance of the class with
       any dependencies injected.
-       For example:
-       ```javascript
+     For example:
+     ```javascript
     import { getOwner } from '@ember/application';
-       let owner = getOwner(otherInstance);
+     let owner = getOwner(otherInstance);
     // the owner is commonly the `applicationInstance`, and can be accessed via
     // an instance initializer.
-       let factory = owner.factoryFor('service:bespoke');
-       factory.class;
+     let factory = owner.factoryFor('service:bespoke');
+     factory.class;
     // The registered or resolved class. For example when used with an Ember-CLI
     // app, this would be the default export from `app/services/bespoke.js`.
-       let instance = factory.create({
+     let instance = factory.create({
       someProperty: 'an initial property value'
     });
     // Create an instance with any injections and the passed options as
     // initial properties.
     ```
-       Any instances created via the factory's `.create()` method *must* be destroyed
+     Any instances created via the factory's `.create()` method *must* be destroyed
     manually by the caller of `.create()`. Typically, this is done during the creating
     objects own `destroy` or `willDestroy` methods.
-       @public
+     @public
     @method factoryFor
     @param {String} fullName
     @param {Object} options
@@ -23473,62 +23459,62 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Given a fullName return the corresponding factory.
-        @public
+      @public
      @method resolveRegistration
      @param {String} fullName
      @return {Function} fullName's factory
      */
-    resolveRegistration(fullName, options) {
+    resolveRegistration(fullName) {
       (true && !(this.__registry__.isValidFullName(fullName)) && (0, _debug.assert)('fullName must be a proper full name', this.__registry__.isValidFullName(fullName)));
-      return this.__registry__.resolve(fullName, options);
+      return this.__registry__.resolve(fullName);
     },
 
     /**
       Registers a factory that can be used for dependency injection (with
       `inject`) or for service lookup. Each factory is registered with
       a full name including two parts: `type:name`.
-         A simple example:
-         ```javascript
+       A simple example:
+       ```javascript
       import Application from '@ember/application';
       import EmberObject from '@ember/object';
-         let App = Application.create();
-         App.Orange = EmberObject.extend();
+       let App = Application.create();
+       App.Orange = EmberObject.extend();
       App.register('fruit:favorite', App.Orange);
       ```
-         Ember will resolve factories from the `App` namespace automatically.
+       Ember will resolve factories from the `App` namespace automatically.
       For example `App.CarsController` will be discovered and returned if
       an application requests `controller:cars`.
-         An example of registering a controller with a non-standard name:
-         ```javascript
+       An example of registering a controller with a non-standard name:
+       ```javascript
       import Application from '@ember/application';
       import Controller from '@ember/controller';
-         let App = Application.create();
+       let App = Application.create();
       let Session = Controller.extend();
-         App.register('controller:session', Session);
-         // The Session controller can now be treated like a normal controller,
+       App.register('controller:session', Session);
+       // The Session controller can now be treated like a normal controller,
       // despite its non-standard name.
       App.ApplicationController = Controller.extend({
         needs: ['session']
       });
       ```
-         Registered factories are **instantiated** by having `create`
+       Registered factories are **instantiated** by having `create`
       called on them. Additionally they are **singletons**, each time
       they are looked up they return the same instance.
-         Some examples modifying that default behavior:
-         ```javascript
+       Some examples modifying that default behavior:
+       ```javascript
       import Application from '@ember/application';
       import EmberObject from '@ember/object';
-         let App = Application.create();
-         App.Person = EmberObject.extend();
+       let App = Application.create();
+       App.Person = EmberObject.extend();
       App.Orange = EmberObject.extend();
       App.Email = EmberObject.extend();
       App.session = EmberObject.create();
-         App.register('model:user', App.Person, { singleton: false });
+       App.register('model:user', App.Person, { singleton: false });
       App.register('fruit:favorite', App.Orange);
       App.register('communication:main', App.Email, { singleton: false });
       App.register('session', App.session, { instantiate: false });
       ```
-         @method register
+       @method register
       @param  fullName {String} type:name (e.g., 'model:user')
       @param  factory {any} (e.g., App.Person)
       @param  options {Object} (optional) disable instantiation or singleton usage
@@ -23538,17 +23524,17 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Unregister a factory.
-        ```javascript
+      ```javascript
      import Application from '@ember/application';
      import EmberObject from '@ember/object';
-        let App = Application.create();
+      let App = Application.create();
      let User = EmberObject.extend();
      App.register('model:user', User);
-        App.resolveRegistration('model:user').create() instanceof User //=> true
-        App.unregister('model:user')
+      App.resolveRegistration('model:user').create() instanceof User //=> true
+      App.unregister('model:user')
      App.resolveRegistration('model:user') === undefined //=> true
      ```
-        @public
+      @public
      @method unregister
      @param {String} fullName
      */
@@ -23556,7 +23542,7 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Check if a factory is registered.
-        @public
+      @public
      @method hasRegistration
      @param {String} fullName
      @return {Boolean}
@@ -23565,7 +23551,7 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Return a specific registered option for a particular factory.
-        @public
+      @public
      @method registeredOption
      @param  {String} fullName
      @param  {String} optionName
@@ -23575,7 +23561,7 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Register options for a particular factory.
-        @public
+      @public
      @method registerOptions
      @param {String} fullName
      @param {Object} options
@@ -23584,7 +23570,7 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Return registered options for a particular factory.
-        @public
+      @public
      @method registeredOptions
      @param  {String} fullName
      @return {Object} options
@@ -23593,22 +23579,22 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Allow registering options for all factories of a type.
-        ```javascript
+      ```javascript
      import Application from '@ember/application';
-        let App = Application.create();
+      let App = Application.create();
      let appInstance = App.buildInstance();
-        // if all of type `connection` must not be singletons
+      // if all of type `connection` must not be singletons
      appInstance.registerOptionsForType('connection', { singleton: false });
-        appInstance.register('connection:twitter', TwitterConnection);
+      appInstance.register('connection:twitter', TwitterConnection);
      appInstance.register('connection:facebook', FacebookConnection);
-        let twitter = appInstance.lookup('connection:twitter');
+      let twitter = appInstance.lookup('connection:twitter');
      let twitter2 = appInstance.lookup('connection:twitter');
-        twitter === twitter2; // => false
-        let facebook = appInstance.lookup('connection:facebook');
+      twitter === twitter2; // => false
+      let facebook = appInstance.lookup('connection:facebook');
      let facebook2 = appInstance.lookup('connection:facebook');
-        facebook === facebook2; // => false
+      facebook === facebook2; // => false
      ```
-        @public
+      @public
      @method registerOptionsForType
      @param {String} type
      @param {Object} options
@@ -23617,7 +23603,7 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
 
     /**
      Return the registered options for all factories of a type.
-        @public
+      @public
      @method registeredOptionsForType
      @param {String} type
      @return {Object} options
@@ -23627,41 +23613,42 @@ define("@ember/-internals/runtime/lib/mixins/registry_proxy", ["exports", "@embe
     /**
       Define a dependency injection onto a specific factory or all factories
       of a type.
-         When Ember instantiates a controller, view, or other framework component
+       When Ember instantiates a controller, view, or other framework component
       it can attach a dependency to that component. This is often used to
       provide services to a set of framework components.
-         An example of providing a session object to all controllers:
-         ```javascript
+       An example of providing a session object to all controllers:
+       ```javascript
       import { alias } from '@ember/object/computed';
       import Application from '@ember/application';
       import Controller from '@ember/controller';
       import EmberObject from '@ember/object';
-         let App = Application.create();
+       let App = Application.create();
       let Session = EmberObject.extend({ isAuthenticated: false });
-         // A factory must be registered before it can be injected
+       // A factory must be registered before it can be injected
       App.register('session:main', Session);
-         // Inject 'session:main' onto all factories of the type 'controller'
+       // Inject 'session:main' onto all factories of the type 'controller'
       // with the name 'session'
       App.inject('controller', 'session', 'session:main');
-         App.IndexController = Controller.extend({
+       App.IndexController = Controller.extend({
         isLoggedIn: alias('session.isAuthenticated')
       });
       ```
-         Injections can also be performed on specific factories.
-         ```javascript
+       Injections can also be performed on specific factories.
+       ```javascript
       App.inject(<full_name or type>, <property name>, <full_name>)
       App.inject('route', 'source', 'source:main')
       App.inject('route:application', 'email', 'model:email')
       ```
-         It is important to note that injections can only be performed on
+       It is important to note that injections can only be performed on
       classes that are instantiated by Ember itself. Instantiating a class
       directly (via `create` or `new`) bypasses the dependency injection
       system.
-         @public
+       @public
       @method inject
       @param  factoryNameOrType {String}
       @param  property {String}
       @param  injectionName {String}
+      @deprecated
     **/
     inject: registryAlias('injection')
   });
@@ -26078,7 +26065,7 @@ define("@ember/-internals/utils/index", ["exports", "@glimmer/util", "@ember/deb
 
 
   function canInvoke(obj, methodName) {
-    return obj !== null && obj !== undefined && typeof obj[methodName] === 'function';
+    return obj != null && typeof obj[methodName] === 'function';
   }
   /**
     @module @ember/utils
@@ -28373,12 +28360,12 @@ define("@ember/application/instance", ["exports", "@ember/-internals/metal", "@e
         @default auto-detected
         @private
       */
-      this.isInteractive = environment.hasDOM; // This default is overridable below
+      this.isInteractive = Boolean(environment.hasDOM); // This default is overridable below
 
       /**
         @property _renderMode
         @type string
-        @default false
+        @default undefined
         @private
       */
 
@@ -28405,7 +28392,7 @@ define("@ember/application/instance", ["exports", "@ember/-internals/metal", "@e
       if (options.isBrowser !== undefined) {
         this.isBrowser = Boolean(options.isBrowser);
       } else {
-        this.isBrowser = environment.hasDOM;
+        this.isBrowser = Boolean(environment.hasDOM);
       }
 
       if (!this.isBrowser) {
@@ -29646,7 +29633,7 @@ define("@ember/canary-features/index", ["exports", "@ember/-internals/environmen
   Object.defineProperty(_exports, "__esModule", {
     value: true
   });
-  _exports.FEATURES = _exports.EMBER_STRICT_MODE = _exports.EMBER_ROUTING_ROUTER_SERVICE_REFRESH = _exports.EMBER_NAMED_BLOCKS = _exports.EMBER_LIBRARIES_ISREGISTERED = _exports.EMBER_IMPROVED_INSTRUMENTATION = _exports.EMBER_GLIMMER_INVOKE_HELPER = _exports.EMBER_GLIMMER_HELPER_MANAGER = _exports.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = _exports.EMBER_CACHED = _exports.DEFAULT_FEATURES = void 0;
+  _exports.FEATURES = _exports.EMBER_ROUTING_ROUTER_SERVICE_REFRESH = _exports.EMBER_LIBRARIES_ISREGISTERED = _exports.EMBER_IMPROVED_INSTRUMENTATION = _exports.EMBER_CACHED = _exports.DEFAULT_FEATURES = void 0;
   _exports.isEnabled = isEnabled;
 
   /**
@@ -29662,11 +29649,6 @@ define("@ember/canary-features/index", ["exports", "@ember/-internals/environmen
   var DEFAULT_FEATURES = {
     EMBER_LIBRARIES_ISREGISTERED: null,
     EMBER_IMPROVED_INSTRUMENTATION: null,
-    EMBER_NAMED_BLOCKS: true,
-    EMBER_GLIMMER_HELPER_MANAGER: true,
-    EMBER_GLIMMER_INVOKE_HELPER: true,
-    EMBER_STRICT_MODE: true,
-    EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
     EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
     EMBER_CACHED: true
   };
@@ -29724,16 +29706,6 @@ define("@ember/canary-features/index", ["exports", "@ember/-internals/environmen
   _exports.EMBER_LIBRARIES_ISREGISTERED = EMBER_LIBRARIES_ISREGISTERED;
   var EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
   _exports.EMBER_IMPROVED_INSTRUMENTATION = EMBER_IMPROVED_INSTRUMENTATION;
-  var EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
-  _exports.EMBER_NAMED_BLOCKS = EMBER_NAMED_BLOCKS;
-  var EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
-  _exports.EMBER_GLIMMER_HELPER_MANAGER = EMBER_GLIMMER_HELPER_MANAGER;
-  var EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
-  _exports.EMBER_GLIMMER_INVOKE_HELPER = EMBER_GLIMMER_INVOKE_HELPER;
-  var EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
-  _exports.EMBER_STRICT_MODE = EMBER_STRICT_MODE;
-  var EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS);
-  _exports.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = EMBER_DYNAMIC_HELPERS_AND_MODIFIERS;
   var EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH);
   _exports.EMBER_ROUTING_ROUTER_SERVICE_REFRESH = EMBER_ROUTING_ROUTER_SERVICE_REFRESH;
   var EMBER_CACHED = featureValue(FEATURES.EMBER_CACHED);
@@ -30295,6 +30267,8 @@ define("@ember/debug/lib/capture-render-tree", ["exports", "@glimmer/util"], fun
     @since 3.14.0
   */
   function captureRenderTree(app) {
+    // SAFETY: Ideally we'd assert here but that causes awkward circular requires since this is also in @ember/debug.
+    // This is only for debug stuff so not very risky.
     var renderer = (0, _util.expect)(app.lookup('renderer:-dom'), `BUG: owner is missing renderer`);
     return renderer.debugRenderTree.capture();
   }
@@ -55441,20 +55415,9 @@ define("ember/index", ["exports", "require", "@ember/-internals/environment", "@
   Ember._get = _runtime2.get;
   Ember._on = _runtime2.on;
   Ember._fn = _runtime2.fn;
-
-  if (true
-  /* EMBER_GLIMMER_HELPER_MANAGER */
-  ) {
-    Ember._helperManagerCapabilities = _manager.helperCapabilities;
-    Ember._setHelperManager = _manager.setHelperManager;
-  }
-
-  if (true
-  /* EMBER_GLIMMER_INVOKE_HELPER */
-  ) {
-    Ember._invokeHelper = _runtime2.invokeHelper;
-  }
-
+  Ember._helperManagerCapabilities = _manager.helperCapabilities;
+  Ember._setHelperManager = _manager.setHelperManager;
+  Ember._invokeHelper = _runtime2.invokeHelper;
   Ember._captureRenderTree = EmberDebug.captureRenderTree;
 
   var deprecateImportFromString = function (name, message) {
@@ -55650,7 +55613,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.4.0-alpha.1";
+  var _default = "4.4.0-alpha.2";
   _exports.default = _default;
 });
 define("route-recognizer", ["exports"], function (_exports) {
@@ -58216,7 +58179,7 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
       var lastArg = modelsArray[modelsArray.length - 1];
       var queryParams = {};
 
-      if (lastArg !== undefined && lastArg.hasOwnProperty('queryParams')) {
+      if (lastArg && Object.prototype.hasOwnProperty.call(lastArg, 'queryParams')) {
         // We just checked this.
         // TODO: Use an assertion?
         queryParams = modelsArray.pop().queryParams;