Merge pull request #2177 from bgantzler/fixHasEmberData

Fix regex that checks if ember data is present to allow for difference in namespace
miragejs · Apr 30, 2021 · e9af35e · e9af35e
2 parents 965097a + 2f53902
commit e9af35e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/addon/utils/ember-data.js b/addon/utils/ember-data.js
@@ -1,8 +1,10 @@
 /* global requirejs */
 
 function _hasEmberData() {
-  let matchRegex = /^ember-data/i;
-  return !!(Object.keys(requirejs.entries).find(e => !!e.match(matchRegex)));
+  let matchRegex1 = /^ember-data/i;
+  let matchRegex2 = /^@ember-data/i;
+
+  return !!(Object.keys(requirejs.entries).find(e => !!e.match(matchRegex2) || !!e.match(matchRegex1) ));
 }
 
 /**