Skip to content

Commit 40a0332

Browse files
committed
Normalize to always import from 'backburner.js'
We had a mix of different import locations for this, both the ES imports via `backburner.js` and the Ember CLI-munged version available at `backburner`. Switch to only using the Node-resolveable version, so TS can resolve it correctly; and enforce it by removing `backburner` from the list of `core` modules in the ESLint config.
1 parent bd784a7 commit 40a0332

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

packages/@ember/routing/router.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import type {
4343
TransitionState,
4444
} from 'router_js';
4545
import Router, { logAbort, STATE_SYMBOL } from 'router_js';
46-
import type { Timer } from 'backburner';
46+
import type { Timer } from 'backburner.js';
4747
import EngineInstance from '@ember/engine/instance';
4848
import type { QueryParams } from 'route-recognizer';
4949
import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utility-types';

packages/@ember/runloop/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { assert } from '@ember/debug';
22
import { onErrorTarget } from '@ember/-internals/error-handling';
33
import { flushAsyncObservers } from '@ember/-internals/metal';
4-
import type { DeferredActionQueues } from 'backburner';
5-
import Backburner, { Timer } from 'backburner';
4+
import type { DeferredActionQueues } from 'backburner.js';
5+
import Backburner, { Timer } from 'backburner.js';
66
import type { AnyFn } from '@ember/-internals/utility-types';
77

88
export { Timer };

packages/ember/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as metal from '@ember/-internals/metal';
1313
import { FEATURES, isEnabled } from '@ember/canary-features';
1414
import * as EmberDebug from '@ember/debug';
1515
import { assert, captureRenderTree, deprecate } from '@ember/debug';
16-
import Backburner from 'backburner';
16+
import Backburner from 'backburner.js';
1717
import Controller, { inject as injectController, ControllerMixin } from '@ember/controller';
1818
import {
1919
_getStrings,

0 commit comments

Comments
 (0)