From c290aa067f4adbccb1395c7e3539797cc17cc8c0 Mon Sep 17 00:00:00 2001 From: Aleksandr Kanunnikov Date: Thu, 29 Apr 2021 16:54:12 +0300 Subject: [PATCH] ember lookup util --- ember_debug/adapters/basic.js | 7 +------ ember_debug/adapters/web-extension.js | 7 +------ ember_debug/adapters/websocket.js | 8 ++------ ember_debug/container-debug.js | 8 ++------ ember_debug/data-debug.js | 7 +------ ember_debug/deprecation-debug.js | 7 +------ ember_debug/general-debug.js | 8 ++------ ember_debug/libs/capture-render-tree.js | 8 +------- ember_debug/libs/promise-assembler.js | 7 +------ ember_debug/libs/source-map.js | 8 ++------ ember_debug/main.js | 7 +------ ember_debug/mixins/port-mixin.js | 8 ++------ ember_debug/models/profile-manager.js | 8 ++------ ember_debug/models/profile-node.js | 8 ++------ ember_debug/models/promise.js | 8 ++------ ember_debug/object-inspector.js | 7 +------ ember_debug/port.js | 7 +------ ember_debug/promise-debug.js | 8 ++------ ember_debug/render-debug.js | 7 +------ ember_debug/route-debug.js | 7 +------ ember_debug/services/session.js | 8 ++------ ember_debug/utils/ember.js | 8 ++++++++ ember_debug/utils/type-check.js | 7 +------ ember_debug/view-debug.js | 8 +------- 24 files changed, 41 insertions(+), 140 deletions(-) create mode 100644 ember_debug/utils/ember.js diff --git a/ember_debug/adapters/basic.js b/ember_debug/adapters/basic.js index bc495fac56..b421010cca 100644 --- 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 index 5e3e574c52..2ad9973aa8 100644 --- 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 index 591840e9a8..d09cf738c8 100644 --- 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 index 669a4362b9..940c912f24 100644 --- 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 index 1d2c43d504..df6cf0b4fc 100644 --- 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 index 89fbd212c8..1fbe33de55 100644 --- 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 index 047643879a..4106c63d8f 100644 --- 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 index 4fe4269bca..91c62d297b 100644 --- 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 index 21f04ac68f..f1107b4330 100644 --- 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 index 8b74b16261..a6440bda1b 100644 --- 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 index 0e3049a030..980a689188 100644 --- 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 index cb7bf385ab..95ea88550d 100644 --- 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 index f81a8c9b27..e00fc480e5 100644 --- 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 index 10935a1b1e..6347431140 100644 --- 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 index c3039449e8..7022624855 100644 --- 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 index 993053548a..65508e0745 100644 --- 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 index 369fd703c4..2238fc1146 100644 --- 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 index e106cad703..0695aaaf4b 100644 --- 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 index 713be44c53..49b4b9a461 100644 --- 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 index 6cdd1fa4de..6276165a03 100644 --- 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 index 3c59e4acb2..9dbdf99da8 100644 --- 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 new file mode 100644 index 0000000000..93b7aa3dd2 --- /dev/null +++ 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 index 822c3a9e7b..0b066ac3ee 100644 --- 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 index bc49c0b680..96554b443b 100644 --- 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;