ember-source 3.28.3 → 3.28.7

package/dist/header/license.js

@@ -5,5 +5,5 @@
  *            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   3.28.3
+ * @version   3.28.7
  */

package/dist/packages/@ember/-internals/container/index.js

@@ -37,6 +37,13 @@ if (DEBUG) {
   } catch (e) {// ignore
   }
 }
+
+class DeprecatedStoreInjection {
+  constructor(store) {
+    this.store = store;
+  }
+
+}
 /**
  A container used to instantiate and cache objects.
 
@@ -51,7 +58,6 @@ if (DEBUG) {
  @class Container
  */
 
-
 class Container {
   constructor(registry, options = {}) {
     this.registry = registry;
@@ -396,7 +402,13 @@ function injectionsFor(container, fullName) {
   let [type] = fullName.split(':');
   let typeInjections = registry.getTypeInjections(type);
   let injections = registry.getInjections(fullName);
-  return buildInjections(container, typeInjections, injections);
+  let result = buildInjections(container, typeInjections, injections);
+
+  if (DEBUG && type === 'route' && result.injections.store) {
+    result.injections.store = new DeprecatedStoreInjection(result.injections.store);
+  }
+
+  return result;
 }
 
 function destroyDestroyables(container) {
@@ -450,7 +462,7 @@ class FactoryManager {
     this.injections = undefined;
     setFactoryFor(this, this);
 
-    if (factory && (HAS_NATIVE_SYMBOL || INIT_FACTORY in factory)) {
+    if (isInstantiatable(container, fullName) && (HAS_NATIVE_SYMBOL || INIT_FACTORY in factory)) {
       setFactoryFor(factory, this);
     }
   }
@@ -1116,4 +1128,4 @@ The public API, specified on the application namespace should be considered the
   @private
 */
 
-export { Registry, privatize, Container, getFactoryFor, setFactoryFor, INIT_FACTORY };
+export { Registry, privatize, Container, getFactoryFor, setFactoryFor, INIT_FACTORY, DeprecatedStoreInjection };

package/dist/packages/@ember/-internals/routing/lib/system/route.js

@@ -1,4 +1,4 @@
-import { privatize as P } from '@ember/-internals/container';
+import { DeprecatedStoreInjection, privatize as P } from '@ember/-internals/container';
 import { addObserver, computed, defineProperty, descriptorForProperty, flushAsyncObservers, get, getProperties, isEmpty, set, setProperties } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { A as emberA, ActionHandler, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
@@ -8,7 +8,6 @@ import { ROUTER_EVENTS } from '@ember/deprecated-features';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { assign } from '@ember/polyfills';
 import { once } from '@ember/runloop';
-import { classify } from '@ember/string';
 import { DEBUG } from '@glimmer/env';
 import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
 import { calculateCacheKey, deprecateTransitionMethods, normalizeControllerQueryParams, prefixRouteNameArg, stashParamNames } from '../utils';
@@ -1999,18 +1998,17 @@ Route.reopen(ActionHandler, Evented, {
     get() {
       let owner = getOwner(this);
       let routeName = this.routeName;
-      let namespace = get(this, '_router.namespace');
       return {
         find(name, value) {
           let modelClass = owner.factoryFor(`model:${name}`);
-          assert(`You used the dynamic segment ${name}_id in your route ${routeName}, but ${namespace}.${classify(name)} did not exist and you did not override your route's \`model\` hook.`, Boolean(modelClass));
+          assert(`You used the dynamic segment \`${name}_id\` in your route ` + `\`${routeName}\` for which Ember requires you provide a ` + `data-loading implementation. Commonly, that is done by ` + `adding a model hook implementation on the route ` + `(\`model({${name}_id}) {\`) or by injecting an implemention of ` + `a data store: \`@service store;\`.`, Boolean(modelClass));
 
           if (!modelClass) {
             return;
           }
 
           modelClass = modelClass.class;
-          assert(`${classify(name)} has no method \`find\`.`, typeof modelClass.find === 'function');
+          assert(`You used the dynamic segment \`${name}_id\` in your route ` + `\`${routeName}\` for which Ember requires you provide a ` + `data-loading implementation. Commonly, that is done by ` + `adding a model hook implementation on the route ` + `(\`model({${name}_id}) {\`) or by injecting an implemention of ` + `a data store: \`@service store;\`.\n\n` + `Rarely, applications may attempt to use a legacy behavior where ` + `the model class (in this case \`${name}\`) is resolved and the ` + `\`find\` method on that class is invoked to load data. In this ` + `application, a model of \`${name}\` was found but it did not ` + `provide a \`find\` method. You should not add a \`find\` ` + `method to your model. Instead, please implement an appropriate ` + `\`model\` hook on the \`${routeName}\` route.`, typeof modelClass.find === 'function');
           return modelClass.find(value);
         }
 
@@ -2018,7 +2016,28 @@ Route.reopen(ActionHandler, Evented, {
     },
 
     set(key, value) {
-      defineProperty(this, key, null, value);
+      if (DEBUG && value instanceof DeprecatedStoreInjection) {
+        Object.defineProperty(this, key, {
+          configurable: true,
+          enumerable: false,
+
+          get() {
+            deprecate(`A value for the \`store\` property was injected onto a route via the owner API. Implicit injection via the owner API is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`, false, {
+              id: 'implicit-injections',
+              until: '4.0.0',
+              url: 'https://deprecations.emberjs.com/v3.x/#toc_implicit-injections',
+              for: 'ember-source',
+              since: {
+                enabled: '3.28.7'
+              }
+            });
+            return value.store;
+          }
+
+        });
+      } else {
+        defineProperty(this, key, null, value);
+      }
     }
 
   }),

package/dist/packages/@ember/-internals/routing/lib/system/router.js

@@ -603,8 +603,7 @@ class EmberRouter extends EmberObject {
       this._toplevelView = null;
     }
 
-    this._super(...arguments);
-
+    super.willDestroy();
     this.reset();
     let instances = this._engineInstances;
 

package/dist/packages/ember/version.js

@@ -1 +1 @@
-export default "3.28.3";
+export default "3.28.7";