Merge pull request #413 from phorest/remove-global-ember-import

Remove global Ember import

Author: josemarluedke

addon/services/apollo.js

@@ -1,4 +1,3 @@
-import Ember from 'ember';
 import { get, set, setProperties, defineProperty } from '@ember/object';
 import { sendEvent } from '@ember/object/events';
 import RSVP from 'rsvp';
@@ -17,6 +16,7 @@ import { run } from '@ember/runloop';
 import { QueryManager } from '../index';
 import { waitForPromise } from '@ember/test-waiters';
 import { tracked } from '@glimmer/tracking';
+import { isTesting } from '@embroider/macros';
 
 const apolloObservableWeakMap = new WeakMap();
 const apolloUnsubscribeWeakMap = new WeakMap();
@@ -137,7 +137,7 @@ export default class ApolloService extends Service {
     let config = getOwner(this).resolveRegistration('config:environment');
     if (config && config.apollo) {
       return config.apollo;
-    } else if (Ember.testing) {
+    } else if (isTesting()) {
       return {
         apiURL: 'http://testserver.example/v1/graph',
       };

package.json

@@ -36,6 +36,7 @@
   "dependencies": {
     "@apollo/client": "^3.2.1",
     "@ember/test-waiters": "~3.0.0",
+    "@embroider/macros": "^1.5.0",
     "@glimmer/tracking": "^1.0.2",
     "broccoli-graphql-filter": "^1.0.0",
     "ember-auto-import": "^1.6.0",
@@ -49,7 +50,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~3.21.2",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^5.3.1",
+    "ember-cli-htmlbars": "^5.7.2",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-terser": "^4.0.0",
     "ember-compatibility-helpers": "^1.2.1",