Merge pull request #20227 from emberjs/bugfix-ts-4.9

[BUGFIX release] Fix unsafe internal cast for NativeArray
emberjs · Oct 18, 2022 · 17a8718 · 17a8718
2 parents c617784 + 04d3a88
commit 17a8718
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
@@ -1958,7 +1958,7 @@ if (ENV.EXTEND_PROTOTYPES.Array) {
 
     if (isEmberArray(arr)) {
       // SAFETY: If it's a true native array and it is also an EmberArray then it should be an Ember NativeArray
-      return arr as NativeArray<T>;
+      return arr as unknown as NativeArray<T>;
     } else {
       // SAFETY: This will return an NativeArray but TS can't infer that.
       return NativeArray.apply(arr ?? []) as NativeArray<T>;

diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
@@ -261,7 +261,7 @@ class CoreObject {
 
       /* globals Proxy Reflect */
       self = new Proxy(this, {
-        get(target: CoreObject & HasUnknownProperty, property, receiver) {
+        get(target: typeof this & HasUnknownProperty, property, receiver) {
           if (property === PROXY_CONTENT) {
             return target;
           } else if (