From 2f53902981e06ce3fc2eb70b9f8c2ff54d34d1a8 Mon Sep 17 00:00:00 2001 From: Brian Gantzler Date: Thu, 29 Apr 2021 13:42:03 -0400 Subject: [PATCH] Fix regex that checks if ember data is present to allow for difference in namespace --- addon/utils/ember-data.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addon/utils/ember-data.js b/addon/utils/ember-data.js index 3ee05a9f7..aacfca3b3 100644 --- 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) )); } /**