Declare ember-data as an optional peer and add @embroider/addon-shim

addon/package.json

@@ -39,11 +39,18 @@
     "start": "yarn build:js -w"
   },
   "peerDependencies": {
+    "ember-data": ">= 3.2",
     "ember-source": "^4.0.0 || >= 5.0.0"
   },
+  "peerDependenciesMeta": {
+    "ember-data": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@ember/test-waiters": "^3.0.2",
+    "@embroider/addon-shim": "^1.8.4",
     "@embroider/macros": "^1.10.0",
     "@embroider/util": "^1.9.0"
   },
@@ -63,6 +70,7 @@
     "@typescript-eslint/parser": "^4.33.0",
     "concurrently": "^7.6.0",
     "documentation": "^14.0.1",
+    "ember-data": "^4.12.0",
     "ember-source": "~4.9.2",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.6.0",

addon/src/-internal/build-registry.ts

@@ -3,8 +3,12 @@ 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 {
+  dependencySatisfies,
+  importSync,
+  macroCondition,
+} from '@embroider/macros';
 
 /**
  * Adds methods that are normally only on registry to the container. This is largely to support the legacy APIs
@@ -116,13 +120,15 @@ export default function (resolver: Resolver) {
 
   exposeRegistryMethodsWithoutDeprecations(container);
 
-  if (has('ember-data/setup-container')) {
+  if (macroCondition(dependencySatisfies('ember-data', '>= 2.3.0'))) {
     // 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'];
+    let setupContainer = (importSync('ember-data/setup-container') as any)[
+      'default'
+    ];
     setupContainer(registry || container);
   }