Skip to content

Commit 02bfb07

Browse files
Merge pull request #1472 from emberjs/dont-use-require
Remove require usage, dropping support for automatic ember-data/setup-container inclusion
2 parents 93e659e + f1d0de4 commit 02bfb07

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import ApplicationInstance from '@ember/application/instance';
33
import Application from '@ember/application';
44
import EmberObject from '@ember/object';
55

6-
import require, { has } from 'require';
76
import Ember from 'ember';
87

98
import type { FullName } from '@ember/owner';
@@ -147,16 +146,6 @@ export default function buildRegistry(resolver: Resolver) {
147146

148147
exposeRegistryMethodsWithoutDeprecations(container);
149148

150-
if (has('ember-data/setup-container')) {
151-
// ember-data is a proper ember-cli addon since 2.3; if no 'import
152-
// 'ember-data'' is present somewhere in the tests, there is also no `DS`
153-
// available on the globalContext and hence ember-data wouldn't be setup
154-
// correctly for the tests; that's why we import and call setupContainer
155-
// here; also see https://github.com/emberjs/data/issues/4071 for context
156-
let setupContainer = require('ember-data/setup-container')['default'];
157-
setupContainer(owner);
158-
}
159-
160149
return {
161150
registry,
162151
container,

0 commit comments

Comments
 (0)