ember lookup util (#1559)

emberjs · Apr 29, 2021 · e2caca2 · e2caca2
1 parent 33b6124
commit e2caca2
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 140 deletions.
diff --git a/ember_debug/adapters/basic.js b/ember_debug/adapters/basic.js
@@ -1,10 +1,5 @@
 /* eslint no-console: 0 */
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
 const { A, computed, RSVP, Object: EmberObject } = Ember;
 const { Promise, resolve } = RSVP;
 import { onReady } from '../utils/on-ready';

diff --git a/ember_debug/adapters/web-extension.js b/ember_debug/adapters/web-extension.js
@@ -1,12 +1,7 @@
 import BasicAdapter from './basic';
 import { typeOf } from '../utils/type-check';
+import Ember from '../utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const { run } = Ember;
 const { isArray } = Array;
 const { keys } = Object;

diff --git a/ember_debug/adapters/websocket.js b/ember_debug/adapters/websocket.js
@@ -1,10 +1,6 @@
 import BasicAdapter from './basic';
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const {
   computed,
   run,

diff --git a/ember_debug/container-debug.js b/ember_debug/container-debug.js
@@ -1,11 +1,7 @@
 // eslint-disable-next-line ember/no-mixins
 import PortMixin from 'ember-debug/mixins/port-mixin';
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './utils/ember';
+
 const { Object: EmberObject, computed } = Ember;
 const { readOnly } = computed;
 

diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js
@@ -1,12 +1,7 @@
 // eslint-disable-next-line ember/no-mixins
 import PortMixin from 'ember-debug/mixins/port-mixin';
+import Ember from './utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const { Object: EmberObject, computed, guidFor, A, set } = Ember;
 const { alias } = computed;
 

diff --git a/ember_debug/deprecation-debug.js b/ember_debug/deprecation-debug.js
@@ -2,12 +2,7 @@
 import PortMixin from 'ember-debug/mixins/port-mixin';
 import SourceMap from 'ember-debug/libs/source-map';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './utils/ember';
 
 const { Debug, Object: EmberObject, computed, guidFor, RSVP, A } = Ember;
 const { resolve, all } = RSVP;

diff --git a/ember_debug/general-debug.js b/ember_debug/general-debug.js
@@ -1,12 +1,8 @@
 /* eslint no-empty:0 */
 // eslint-disable-next-line ember/no-mixins
 import PortMixin from 'ember-debug/mixins/port-mixin';
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './utils/ember';
+
 const { Object: EmberObject } = Ember;
 let { libraries } = Ember;
 

diff --git a/ember_debug/libs/capture-render-tree.js b/ember_debug/libs/capture-render-tree.js
@@ -1,14 +1,8 @@
 import { compareVersion } from '../utils/version';
+import Ember from '../utils/ember';
 
 /* eslint-disable no-console, no-inner-declarations */
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
-
 let captureRenderTree;
 
 // Ember 3.14+ comes with debug render tree, but the version in 3.14.0/3.14.1 is buggy

diff --git a/ember_debug/libs/promise-assembler.js b/ember_debug/libs/promise-assembler.js
@@ -6,13 +6,8 @@
  */
 
 import Promise from 'ember-debug/models/promise';
+import Ember from '../utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const { Object: EmberObject, Evented, A, computed, RSVP, isNone } = Ember;
 
 let PromiseAssembler = EmberObject.extend(Evented, {

diff --git a/ember_debug/libs/source-map.js b/ember_debug/libs/source-map.js
@@ -3,12 +3,8 @@
  * A lot of the code is inspired by/taken from
  * https://github.com/evanw/node-source-map-support
  */
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const {
   Object: EmberObject,
   A,

diff --git a/ember_debug/main.js b/ember_debug/main.js
@@ -10,13 +10,8 @@ import PromiseDebug from 'ember-debug/promise-debug';
 import ContainerDebug from 'ember-debug/container-debug';
 import DeprecationDebug from 'ember-debug/deprecation-debug';
 import Session from 'ember-debug/services/session';
+import Ember from './utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const {
   Object: EmberObject,
   run,

diff --git a/ember_debug/mixins/port-mixin.js b/ember_debug/mixins/port-mixin.js
@@ -1,9 +1,5 @@
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const { Mixin } = Ember;
 
 // eslint-disable-next-line ember/no-new-mixins

diff --git a/ember_debug/models/profile-manager.js b/ember_debug/models/profile-manager.js
@@ -1,10 +1,6 @@
 import ProfileNode from './profile-node';
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const {
   run: { later, scheduleOnce },
 } = Ember;

diff --git a/ember_debug/models/profile-node.js b/ember_debug/models/profile-node.js
@@ -3,12 +3,8 @@
 
   @class ProfileNode
 **/
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const { get, guidFor } = Ember;
 
 const ProfileNode = function (start, payload, parent, now) {

diff --git a/ember_debug/models/promise.js b/ember_debug/models/promise.js
@@ -1,11 +1,7 @@
 import { typeOf } from '../utils/type-check';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const { Object: EmberObject, computed, A } = Ember;
 
 const dateComputed = function () {

diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -9,13 +9,8 @@ import {
 } from 'ember-debug/utils/type-check';
 import { compareVersion } from 'ember-debug/utils/version';
 import { typeOf } from './utils/type-check';
+import Ember from './utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const {
   Object: EmberObject,
   inspect: emberInspect,

diff --git a/ember_debug/port.js b/ember_debug/port.js
@@ -1,9 +1,4 @@
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './utils/ember';
 const { Object: EmberObject, computed, run } = Ember;
 const { or, readOnly } = computed;
 

diff --git a/ember_debug/promise-debug.js b/ember_debug/promise-debug.js
@@ -1,12 +1,8 @@
 // eslint-disable-next-line ember/no-mixins
 import PortMixin from 'ember-debug/mixins/port-mixin';
 import PromiseAssembler from 'ember-debug/libs/promise-assembler';
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './utils/ember';
+
 const { computed, Object: EmberObject, RSVP, A, run } = Ember;
 const { readOnly } = computed;
 

diff --git a/ember_debug/render-debug.js b/ember_debug/render-debug.js
@@ -1,13 +1,8 @@
 // eslint-disable-next-line ember/no-mixins
 import PortMixin from 'ember-debug/mixins/port-mixin';
 import ProfileManager from './models/profile-manager';
+import Ember from './utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const { subscribe, Object: EmberObject } = Ember;
 
 // Initial setup, that has to occur before the EmberObject init for some reason

diff --git a/ember_debug/route-debug.js b/ember_debug/route-debug.js
@@ -4,13 +4,8 @@ import PortMixin from 'ember-debug/mixins/port-mixin';
 import { compareVersion } from 'ember-debug/utils/version';
 import classify from 'ember-debug/utils/classify';
 import dasherize from 'ember-debug/utils/dasherize';
+import Ember from './utils/ember';
 
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
 const {
   computed,
   observer,

diff --git a/ember_debug/services/session.js b/ember_debug/services/session.js
@@ -1,9 +1,5 @@
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from '../utils/ember';
+
 const { Object: EmberObject } = Ember;
 
 const Session = EmberObject.extend({

diff --git a/ember_debug/utils/ember.js b/ember_debug/utils/ember.js
@@ -0,0 +1,8 @@
+let Ember;
+try {
+  Ember = requireModule('ember')['default'];
+} catch {
+  Ember = window.Ember;
+}
+
+export default Ember;
diff --git a/ember_debug/utils/type-check.js b/ember_debug/utils/type-check.js
@@ -1,9 +1,4 @@
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './ember';
 const { ComputedProperty } = Ember;
 
 /**

diff --git a/ember_debug/view-debug.js b/ember_debug/view-debug.js
@@ -4,13 +4,7 @@ import PortMixin from 'ember-debug/mixins/port-mixin';
 import RenderTree from 'ember-debug/libs/render-tree';
 import ViewInspection from 'ember-debug/libs/view-inspection';
 import bound from 'ember-debug/utils/bound-method';
-
-let Ember;
-try {
-  Ember = requireModule('ember')['default'];
-} catch {
-  Ember = window.Ember;
-}
+import Ember from './utils/ember';
 
 const { computed, Object: EmberObject } = Ember;
 const { readOnly } = computed;