From 519a698b3fdc93ec5475bc8d8dd55ddcbb459ae7 Mon Sep 17 00:00:00 2001 From: bekzod Date: Wed, 19 Sep 2018 13:39:50 +0500 Subject: [PATCH] move WeakSet polyfill to `@ember/polyfills` --- packages/@ember/-internals/runtime/lib/system/core_object.js | 3 +-- packages/@ember/-internals/utils/index.ts | 1 - packages/@ember/-internals/utils/lib/inspect.ts | 2 +- packages/@ember/-internals/utils/lib/is_proxy.ts | 2 +- packages/@ember/-internals/utils/lib/super.ts | 2 +- packages/@ember/polyfills/index.ts | 1 + .../@ember/{-internals/utils => polyfills}/lib/weak_set.ts | 0 7 files changed, 5 insertions(+), 6 deletions(-) rename packages/@ember/{-internals/utils => polyfills}/lib/weak_set.ts (100%) diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js index 03f185c8b98..ece82f22267 100644 --- 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 index 707b57fbec7..8adac68d3d4 100644 --- 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 index ff0f03684a7..2c9b6bae7fe 100644 --- 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 index 9ec455fc723..35ba827c367 100644 --- 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 index f1b1140ffb6..9e45afb55af 100644 --- 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 index cb6526e1ed3..fa4e9006fba 100644 --- 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/packages/@ember/-internals/utils/lib/weak_set.ts b/packages/@ember/polyfills/lib/weak_set.ts similarity index 100% rename from packages/@ember/-internals/utils/lib/weak_set.ts rename to packages/@ember/polyfills/lib/weak_set.ts