Merge pull request #19082 from emberjs/refactor-mixin

[BUGFIX release] Simplify mixin application
emberjs · Aug 10, 2020 · bb4465b · bb4465b
2 parents cabe7da + f77f5a4
commit bb4465b
Show file tree

Hide file tree

Showing 13 changed files with 576 additions and 679 deletions.
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
@@ -38,13 +38,11 @@ export {
   DecoratorPropertyDescriptor,
   isElementDescriptor,
   nativeDescDecorator,
-} from './lib/decorator';
-export {
   descriptorForDecorator,
   descriptorForProperty,
   isClassicDecorator,
   setClassicDecorator,
-} from './lib/descriptor_map';
+} from './lib/decorator';
 export { default as libraries, Libraries } from './lib/libraries';
 export { default as getProperties } from './lib/get_properties';
 export { default as setProperties } from './lib/set_properties';

diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
@@ -16,10 +16,10 @@ import { finishLazyChains, getChainTagsForKey } from './chain-tags';
 import {
   ComputedDescriptor,
   Decorator,
+  descriptorForDecorator,
   isElementDescriptor,
   makeComputedDecorator,
 } from './decorator';
-import { descriptorForDecorator } from './descriptor_map';
 import { defineProperty } from './properties';
 import { get } from './property_get';
 import { set } from './property_set';