make proxies trackable objects, remove custom tagForProperty logic

emberjs · Apr 3, 2019 · 1770c33 · 1770c33
1 parent 7d94591
commit 1770c33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
@@ -20,14 +20,16 @@ export function tagForProperty(object: any, propertyKey: string | symbol, _meta?
   if (objectType !== 'function' && (objectType !== 'object' || object === null)) {
     return CONSTANT_TAG;
   }
+
   let meta = _meta === undefined ? metaFor(object) : _meta;
 
-  if (isProxy(object)) {
+  if (!EMBER_METAL_TRACKED_PROPERTIES && isProxy(object)) {
     return tagFor(object, meta);
   }
 
   let tags = meta.writableTags();
   let tag = tags[propertyKey];
+
   if (tag) {
     return tag;
   }

diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
@@ -15,7 +15,7 @@ import {
   tagFor,
   computed,
 } from '@ember/-internals/metal';
-import { setProxy } from '@ember/-internals/utils';
+import { setProxy, TRACKABLE_OBJECT } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 
 function contentPropertyDidChange(content, contentKey) {
@@ -44,6 +44,8 @@ export function contentFor(proxy, m) {
   @private
 */
 export default Mixin.create({
+  [TRACKABLE_OBJECT]: true,
+
   /**
     The object whose properties will be forwarded.