Skip to content

Commit

Permalink
Merge pull request #1472 from emberjs/dont-use-require
Browse files Browse the repository at this point in the history
Remove require usage, dropping support for automatic ember-data/setup-container inclusion
  • Loading branch information
NullVoxPopuli authored Aug 19, 2024
2 parents 93e659e + f1d0de4 commit 02bfb07
Showing 1 changed file with 0 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import ApplicationInstance from '@ember/application/instance';
import Application from '@ember/application';
import EmberObject from '@ember/object';

import require, { has } from 'require';
import Ember from 'ember';

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

exposeRegistryMethodsWithoutDeprecations(container);

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

return {
registry,
container,
Expand Down

0 comments on commit 02bfb07

Please sign in to comment.