Clean up backports

emberjs · Feb 18, 2025 · f8ad07a · f8ad07a
1 parent cfc8292
commit f8ad07a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/packages/active-record/src/-private/builders/query.ts b/packages/active-record/src/-private/builders/query.ts
@@ -62,13 +62,11 @@ import { copyForwardUrlOptions, extractCacheOptions } from './-utils';
  */
 export function query<T>(
   type: TypeFromInstance<T>,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): QueryRequestOptions<T, CollectionResourceDataDocument<T>>;
 export function query(
   type: string,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): QueryRequestOptions;

diff --git a/packages/json-api/src/-private/builders/query.ts b/packages/json-api/src/-private/builders/query.ts
@@ -71,13 +71,11 @@ import { ACCEPT_HEADER_VALUE, copyForwardUrlOptions, extractCacheOptions } from
  */
 export function query<T extends TypedRecordInstance>(
   type: TypeFromInstance<T>,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource<T>,
   options?: ConstrainedRequestOptions
 ): QueryRequestOptions<T, CollectionResourceDataDocument<T>>;
 export function query(
   type: string,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): QueryRequestOptions;
@@ -159,13 +157,11 @@ export function query(
  */
 export function postQuery<T>(
   type: TypeFromInstance<T>,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): PostQueryRequestOptions<T, CollectionResourceDataDocument<T>>;
 export function postQuery(
   type: string,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): PostQueryRequestOptions;

diff --git a/packages/request/src/-private/context.ts b/packages/request/src/-private/context.ts
@@ -159,8 +159,8 @@ export class Context {
   #owner: ContextOwner;
   declare request: ImmutableRequestInfo;
   declare id: number;
-  private declare _isCacheHandler: boolean;
-  private declare _finalized: boolean;
+  declare private _isCacheHandler: boolean;
+  declare private _finalized: boolean;
 
   constructor(owner: ContextOwner, isCacheHandler: boolean) {
     this.id = owner.requestId;

diff --git a/packages/rest/src/-private/builders/query.ts b/packages/rest/src/-private/builders/query.ts
@@ -62,13 +62,11 @@ import { copyForwardUrlOptions, extractCacheOptions } from './-utils';
  */
 export function query<T>(
   type: TypeFromInstance<T>,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): QueryRequestOptions<T, CollectionResourceDataDocument<T>>;
 export function query(
   type: string,
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   query?: QueryParamsSource,
   options?: ConstrainedRequestOptions
 ): QueryRequestOptions;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/fastboot/package.json b/tests/fastboot/package.json
@@ -68,6 +68,7 @@
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "5.1.0",
     "@ember/test-waiters": "^3.1.0",
+    "@embroider/macros": "^1.16.10",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@ember-data/request": "workspace:*",

diff --git a/tests/main/tests/helpers/reactive-context.gts b/tests/main/tests/helpers/reactive-context.gts
@@ -1,4 +1,4 @@
-import { get } from '@ember/helper';
+import { helper } from '@ember/component/helper';
 import type { TestContext } from '@ember/test-helpers';
 import { render } from '@ember/test-helpers';
 import Component from '@glimmer/component';
@@ -27,6 +27,10 @@ export async function reactiveContext<T extends Model>(
     _fields.push(field.name);
   });
 
+  const lowPolyGet = helper(([obj, prop]: [obj: ReactiveComponent, prop: string]): string => {
+    return obj[prop];
+  });
+
   // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   interface ReactiveComponent extends Record<string, string> {}
   class ReactiveComponent extends Component {
@@ -38,7 +42,7 @@ export async function reactiveContext<T extends Model>(
       <div class="reactive-context">
         <ul>
           {{#each this.__allFields as |prop|}}
-            <li>{{prop}}: {{get this prop}}</li>
+            <li>{{prop}}: {{lowPolyGet this prop}}</li>
           {{/each}}
         </ul>
       </div>