Merge pull request #16990 from bekzod/move-weak-set

move WeakSet polyfill to `@ember/polyfills`
emberjs · Sep 22, 2018 · 183c853 · 183c853
2 parents 560a67c + 519a698
commit 183c853
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -3,14 +3,13 @@
 */
 
 import { FACTORY_FOR } from '@ember/-internals/container';
-import { assign } from '@ember/polyfills';
+import { assign, _WeakSet as WeakSet } from '@ember/polyfills';
 import {
   guidFor,
   getName,
   setName,
   makeArray,
   HAS_NATIVE_PROXY,
-  WeakSet,
   isInternalSymbol,
 } from '@ember/-internals/utils';
 import { schedule } from '@ember/runloop';

diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
@@ -29,7 +29,6 @@ export { getName, setName } from './lib/name';
 export { default as toString } from './lib/to-string';
 export { HAS_NATIVE_SYMBOL } from './lib/symbol-utils';
 export { HAS_NATIVE_PROXY } from './lib/proxy-utils';
-export { default as WeakSet } from './lib/weak_set';
 export { isProxy, setProxy } from './lib/is_proxy';
 export { default as Cache } from './lib/cache';
 

diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -1,4 +1,4 @@
-import WeakSet from './weak_set';
+import { _WeakSet as WeakSet } from '@ember/polyfills';
 const { toString: objectToString } = Object.prototype;
 const { toString: functionToString } = Function.prototype;
 const { isArray } = Array;

diff --git a/packages/@ember/-internals/utils/lib/is_proxy.ts b/packages/@ember/-internals/utils/lib/is_proxy.ts
@@ -1,5 +1,5 @@
+import { _WeakSet as WeakSet } from '@ember/polyfills';
 import { isObject } from './spec';
-import WeakSet from './weak_set';
 
 const PROXIES = new WeakSet();
 

diff --git a/packages/@ember/-internals/utils/lib/super.ts b/packages/@ember/-internals/utils/lib/super.ts
@@ -1,4 +1,4 @@
-import WeakSet from './weak_set';
+import { _WeakSet as WeakSet } from '@ember/polyfills';
 
 const HAS_SUPER_PATTERN = /\.(_super|call\(this|apply\(this)/;
 const fnToString = Function.prototype.toString;

diff --git a/packages/@ember/polyfills/index.ts b/packages/@ember/polyfills/index.ts
@@ -5,4 +5,5 @@ let merge = MERGE ? deprecatedMerge : undefined;
 
 // Export `assignPolyfill` for testing
 export { default as assign, assign as assignPolyfill } from './lib/assign';
+export { default as _WeakSet } from './lib/weak_set';
 export { merge };
diff --git a/...s/@ember/-internals/utils/lib/weak_set.ts → packages/@ember/polyfills/lib/weak_set.ts b/...s/@ember/-internals/utils/lib/weak_set.ts → packages/@ember/polyfills/lib/weak_set.ts