Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove require usage, dropping support for automatic ember-data/setup-container inclusion #1472

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Remove require usage, dropping support for automatic ember-data/setup-container inclusion #1472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a8821
Remove require usage in favor of @embroider/macros
NullVoxPopuli Jul 30, 2024
f1d0de4
Drop support for ember-data/setup-container
NullVoxPopuli Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts
View file
Open in desktop
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