diff --git a/packages/ember-auto-import/ts/inserter.ts b/packages/ember-auto-import/ts/inserter.ts index 4e350a8f..6ba95097 100644 --- a/packages/ember-auto-import/ts/inserter.ts +++ b/packages/ember-auto-import/ts/inserter.ts @@ -33,7 +33,7 @@ export class Inserter extends Plugin { private config: BundleConfig, private options: InserterOptions ) { - super([allApp], { + super([allApp, bundler], { annotation: 'ember-auto-import-inserter', persistentOutput: true, }); diff --git a/packages/ember-auto-import/ts/tests/inserter-test.ts b/packages/ember-auto-import/ts/tests/inserter-test.ts index 38efcc1e..cdd61fb2 100644 --- a/packages/ember-auto-import/ts/tests/inserter-test.ts +++ b/packages/ember-auto-import/ts/tests/inserter-test.ts @@ -14,8 +14,22 @@ import { join } from 'path'; import { Inserter } from '../inserter'; import BundleConfig from '../bundle-config'; import { BuildResult, Bundler } from '../bundler'; +import Plugin from 'broccoli-plugin'; + const { module: Qmodule, test } = QUnit; +class NoopPlugin extends Plugin { + build(): Promise | void { + // noop + } +} + +function asInputNode(obj: any) { + const plugin = new NoopPlugin([]); + Object.assign(plugin, obj); + return plugin as Bundler; +} + Qmodule('inserter', function (hooks) { let builder: Builder; let upstream: string; @@ -28,7 +42,7 @@ Qmodule('inserter', function (hooks) { async function build() { let inserter = new Inserter( new UnwatchedDir(upstream), - { buildResult } as Bundler, + asInputNode({ buildResult }), bundleConfig, { publicAssetURL, diff --git a/test-scenarios/customized-vendor-test.ts b/test-scenarios/customized-vendor-test.ts index d93ec861..beebb512 100644 --- a/test-scenarios/customized-vendor-test.ts +++ b/test-scenarios/customized-vendor-test.ts @@ -124,10 +124,8 @@ function customVendorTest(project: Project, vendorPath: string) { } appScenarios - // ember-cli 2.18 has bugs that don't let it actually work with customized - // vendor paths. When we bump the lts scenario to something newer we can - // drop this check. - .skip('lts') + // ember-cli 6 has removed custom `outputPaths` + .only('lts') .expand({ 'customized-vendor-nested': project => customVendorTest(project, '/js/vendor.js'), 'customized-vendor-top': project => customVendorTest(project, '/top-level-vendor.js'), @@ -146,10 +144,8 @@ appScenarios }); appScenarios - // ember-cli 2.18 has bugs that don't let it actually work with customized - // vendor paths. When we bump the lts scenario to something newer we can - // drop this check. - .skip('lts') + // ember-cli 6 has removed custom `outputPaths` + .only('lts') .map('customized-vendor-fastboot', project => { customVendorTest(project, '/js/vendor.js'); })