Only freeze helper args if weakmap present

emberjs · Dec 12, 2016 · a39c9c1 · a39c9c1
1 parent 2f4e846
commit a39c9c1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 23 deletions.
diff --git a/packages/ember-glimmer/lib/utils/references.js b/packages/ember-glimmer/lib/utils/references.js
@@ -1,4 +1,8 @@
-import { symbol, EmptyObject } from 'ember-utils';
+import {
+  HAS_NATIVE_WEAKMAP,
+  symbol,
+  EmptyObject
+} from 'ember-utils';
 import {
   get,
   set,
@@ -289,8 +293,10 @@ export class SimpleHelperReference extends CachedReference {
       let namedValue = named.value();
 
       runInDebug(() => {
-        Object.freeze(positionalValue);
-        Object.freeze(namedValue);
+        if (HAS_NATIVE_WEAKMAP) {
+          Object.freeze(positionalValue);
+          Object.freeze(namedValue);
+        }
       });
 
       let result = helper(positionalValue, namedValue);
@@ -324,8 +330,10 @@ export class SimpleHelperReference extends CachedReference {
     let namedValue = named.value();
 
     runInDebug(() => {
-      Object.freeze(positionalValue);
-      Object.freeze(namedValue);
+      if (HAS_NATIVE_WEAKMAP) {
+        Object.freeze(positionalValue);
+        Object.freeze(namedValue);
+      }
     });
 
     return helper(positionalValue, namedValue);
@@ -354,8 +362,10 @@ export class ClassBasedHelperReference extends CachedReference {
     let namedValue = named.value();
 
     runInDebug(() => {
-      Object.freeze(positionalValue);
-      Object.freeze(namedValue);
+      if (HAS_NATIVE_WEAKMAP) {
+        Object.freeze(positionalValue);
+        Object.freeze(namedValue);
+      }
     });
 
     return instance.compute(positionalValue, namedValue);

diff --git a/packages/ember-glimmer/tests/integration/helpers/custom-helper-test.js b/packages/ember-glimmer/tests/integration/helpers/custom-helper-test.js
@@ -2,10 +2,8 @@
 import { RenderingTest, moduleFor } from '../../utils/test-case';
 import { makeBoundHelper } from '../../utils/helpers';
 import { runDestroy } from 'internal-test-helpers';
-import {
-  HAS_NATIVE_WEAKMAP,
-  set
-} from 'ember-metal';
+import { set } from 'ember-metal';
+import { HAS_NATIVE_WEAKMAP } from 'ember-utils';
 
 let assert = QUnit.assert;
 

diff --git a/packages/ember-metal/lib/meta.js b/packages/ember-metal/lib/meta.js
@@ -2,7 +2,12 @@
 // Remove "use strict"; from transpiled module until
 // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
 
-import { EmptyObject, lookupDescriptor, symbol } from 'ember-utils';
+import {
+  HAS_NATIVE_WEAKMAP,
+  EmptyObject,
+  lookupDescriptor,
+  symbol
+} from 'ember-utils';
 import isEnabled from './features';
 import { protoMethods as listenerMethods } from './meta_listeners';
 import { runInDebug, assert } from './debug';
@@ -460,17 +465,6 @@ if (isEnabled('mandatory-setter')) {
   };
 }
 
-const HAS_NATIVE_WEAKMAP = (function() {
-  // detect if `WeakMap` is even present
-  let hasWeakMap = typeof WeakMap === 'function';
-  if (!hasWeakMap) { return false; }
-
-  let instance = new WeakMap();
-  // use `Object`'s `.toString` directly to prevent us from detecting
-  // polyfills as native weakmaps
-  return Object.prototype.toString.call(instance) === '[object WeakMap]';
-})();
-
 let setMeta, peekMeta;
 
 // choose the one appropriate for given platform

diff --git a/packages/ember-utils/lib/index.js b/packages/ember-utils/lib/index.js
@@ -30,3 +30,4 @@ export { default as makeArray } from './make-array';
 export { default as applyStr } from './apply-str';
 export { default as NAME_KEY } from './name';
 export { default as toString } from './to-string';
+export { HAS_NATIVE_WEAKMAP } from './weak-map-utils';
diff --git a/packages/ember-utils/lib/weak-map-utils.js b/packages/ember-utils/lib/weak-map-utils.js
@@ -0,0 +1,10 @@
+export const HAS_NATIVE_WEAKMAP = (function() {
+  // detect if `WeakMap` is even present
+  let hasWeakMap = typeof WeakMap === 'function';
+  if (!hasWeakMap) { return false; }
+
+  let instance = new WeakMap();
+  // use `Object`'s `.toString` directly to prevent us from detecting
+  // polyfills as native weakmaps
+  return Object.prototype.toString.call(instance) === '[object WeakMap]';
+})();