Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions addon/src/-private/ember-internals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@
*/
import { get } from '@ember/object';
import { guidFor } from '@ember/object/internals';
import Ember from 'ember';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore: private API, no public types
import { getViewBounds as _getViewBounds } from '@ember/-internals/views';
import type Component from '@ember/component';

const { getViewBounds } = Ember.ViewUtils as unknown as {
getViewBounds(view: Component): { firstNode: Node; lastNode: Node };
const getViewBounds = _getViewBounds as unknown as (view: Component) => {
firstNode: Node;
lastNode: Node;
};

export function componentNodes(view: Component) {
Expand Down
6 changes: 4 additions & 2 deletions addon/src/-private/ember-scheduler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { join, scheduleOnce } from '@ember/runloop';
import { addObserver } from '@ember/object/observers';
import { computed, set } from '@ember/object';
import Ember from 'ember';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore: private API, no public types
import { setClassicDecorator } from '@ember/-internals/metal';
import { DEBUG } from '@glimmer/env';
import { spawn, current, stop, logErrors } from './scheduler.ts';
import { microwait } from './concurrency-helpers.ts';
Expand Down Expand Up @@ -30,7 +32,7 @@ function _computed(fn: (this: HostObject, propertyName: string) => Task) {
// eslint-disable-next-line prefer-rest-params
return (computed(fn) as any)(...arguments);
};
(Ember as any)._setClassicDecorator(cp);
setClassicDecorator(cp);
return cp;
}

Expand Down
4 changes: 2 additions & 2 deletions addon/src/-private/sprite.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { warn } from '@ember/debug';
import Ember from 'ember';
import { macroCondition, isTesting } from '@embroider/macros';
import Transform, { ownTransform, cumulativeTransform } from './transform.ts';
import { continueMotions } from './motion-bridge.ts';
import { collapsedChildren } from './margin-collapse.ts';
Expand Down Expand Up @@ -142,7 +142,7 @@ export default class Sprite {
}
}

if (Ember.testing) {
if (macroCondition(isTesting())) {
Object.seal(this);
}
}
Expand Down
2 changes: 1 addition & 1 deletion test-app/app/components/item-list-example.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { inject as service } from '@ember/service';
import { service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { task } from 'ember-animated/-private/ember-scheduler';
Expand Down
2 changes: 1 addition & 1 deletion test-app/app/routes/demos/hero/detail.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { service } from '@ember/service';

export default class extends Route {
@service store;
Expand Down
2 changes: 1 addition & 1 deletion test-app/app/routes/demos/hero/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { service } from '@ember/service';

export default class extends Route {
@service store;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { Promise as EmberPromise } from 'rsvp';
import { run } from '@ember/runloop';
import { alias } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import { service } from '@ember/service';
import Component from '@ember/component';
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
Expand Down
Loading