Skip to content

Commit f1d0de4

Browse files
committed
Drop support for ember-data/setup-container
1 parent 77a8821 commit f1d0de4

1 file changed

Lines changed: 0 additions & 23 deletions

File tree

addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ import type { Resolver } from '@ember/owner';
22
import ApplicationInstance from '@ember/application/instance';
33
import Application from '@ember/application';
44
import EmberObject from '@ember/object';
5-
import {
6-
macroCondition,
7-
importSync,
8-
dependencySatisfies,
9-
} from '@embroider/macros';
105

11-
import require, { has } from 'require';
126
import Ember from 'ember';
137

148
import type { FullName } from '@ember/owner';
@@ -152,23 +146,6 @@ export default function buildRegistry(resolver: Resolver) {
152146

153147
exposeRegistryMethodsWithoutDeprecations(container);
154148

155-
// ember-data is a proper ember-cli addon since 2.3; if no 'import
156-
// 'ember-data'' is present somewhere in the tests, there is also no `DS`
157-
// available on the globalContext and hence ember-data wouldn't be setup
158-
// correctly for the tests; that's why we import and call setupContainer
159-
// here; also see https://github.com/emberjs/data/issues/4071 for context
160-
if (macroCondition(dependencySatisfies('ember-data', '>= 2.3'))) {
161-
// Additionally, this file is deprecated with no replacement for
162-
// removal in ember-data v6.0
163-
// See: ember-data/dist/setup-container
164-
if (macroCondition(dependencySatisfies('ember-data', '< 6.0'))) {
165-
let { default: setupContainer } = importSync(
166-
'ember-data/setup-container'
167-
) as any;
168-
setupContainer(owner);
169-
}
170-
}
171-
172149
return {
173150
registry,
174151
container,

0 commit comments

Comments
 (0)