Skip to content

Commit a04594b

Browse files
mansonamansona
authored
Cleanup import ember (#2668)
2 parents e8dd6fa + 355b3ae commit a04594b

File tree

14 files changed

+89
-101
lines changed

14 files changed

+89
-101
lines changed

‎ember_debug/adapters/web-extension.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import BasicAdapter from './basic';
22
import { typeOf } from 'ember-debug/utils/type-check';
33

4-
import Ember from 'ember-debug/utils/ember';
4+
import { getEnv } from 'ember-debug/utils/ember';
55
import { run } from 'ember-debug/utils/ember/runloop';
66

77
const { isArray } = Array;
@@ -106,7 +106,7 @@ export default class extends BasicAdapter {
106106
// adapter later. See GH #1114.
107107
const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
108108
try {
109-
return Ember.ENV.EXTEND_PROTOTYPES.Array === true;
109+
return getEnv().EXTEND_PROTOTYPES.Array === true;
110110
} catch {
111111
return false;
112112
}

‎ember_debug/deprecation-debug.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import DebugPort from './debug-port';
22
import SourceMap from 'ember-debug/libs/source-map';
33

4-
import { registerDeprecationHandler } from 'ember-debug/utils/ember/debug';
4+
import { Debug } from 'ember-debug/utils/ember';
55
import { guidFor } from 'ember-debug/utils/ember/object/internals';
66
import { cancel, debounce } from 'ember-debug/utils/ember/runloop';
77

@@ -194,7 +194,7 @@ export default class extends DebugPort {
194194
}
195195

196196
handleDeprecations() {
197-
registerDeprecationHandler((message, options, next) => {
197+
Debug.registerDeprecationHandler((message, options, next) => {
198198
if (!this.adapter) {
199199
next(message, options);
200200
return;

‎ember_debug/general-debug.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-empty:0 */
22
import DebugPort from './debug-port';
33

4-
import Ember from 'ember-debug/utils/ember';
4+
import { libraries } from 'ember-debug/utils/ember';
55

66
/**
77
* Class that handles gathering general information of the inspected app.
@@ -88,7 +88,7 @@ export default class extends DebugPort {
8888
*/
8989
getLibraries() {
9090
this.sendMessage('libraries', {
91-
libraries: Ember.libraries?._registry,
91+
libraries: libraries?._registry,
9292
});
9393
},
9494

‎ember_debug/libs/promise-assembler.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import Promise from 'ember-debug/models/promise';
9-
import RSVP from 'ember-debug/utils/rsvp';
9+
import { RSVP } from 'ember-debug/utils/ember';
1010
import BaseObject from 'ember-debug/utils/base-object';
1111
import Evented from 'ember-debug/utils/evented';
1212

‎ember_debug/models/profile-manager.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ProfileNode from './profile-node';
2-
import Ember from 'ember-debug/utils/ember';
2+
import { VERSION } from 'ember-debug/utils/ember';
33
import { compareVersion } from 'ember-debug/utils/version';
44

55
import { later, scheduleOnce, cancel } from 'ember-debug/utils/ember/runloop';
@@ -75,8 +75,7 @@ export default class ProfileManager {
7575
this.stylesheet = insertStylesheet();
7676
// keep track of all the active highlights
7777
this.highlights = [];
78-
// eslint-disable-next-line ember/new-module-imports
79-
this.isHighlightEnabled = compareVersion(Ember?.VERSION, '3.20.0') !== -1;
78+
this.isHighlightEnabled = compareVersion(VERSION, '3.20.0') !== -1;
8079
}
8180

8281
began(timestamp, payload, now) {

‎ember_debug/promise-debug.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import DebugPort from './debug-port';
22
import PromiseAssembler from 'ember-debug/libs/promise-assembler';
33
import { debounce } from 'ember-debug/utils/ember/runloop';
4-
import RSVP from 'ember-debug/utils/rsvp';
4+
import { RSVP } from 'ember-debug/utils/ember';
55

66
export default class extends DebugPort {
77
get objectInspector() {

‎ember_debug/render-debug.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import DebugPort from './debug-port';
22
import ProfileManager from './models/profile-manager';
33

4-
import { subscribe } from 'ember-debug/utils/ember/instrumentation';
4+
import { subscribe } from 'ember-debug/utils/ember';
55
import { _backburner } from 'ember-debug/utils/ember/runloop';
66
import bound from 'ember-debug/utils/bound-method';
77

‎ember_debug/utils/ember.js‎

Lines changed: 72 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,30 @@ export function emberSafeRequire(id) {
2929
}
3030
}
3131

32-
let ArrayProxy = Ember.ArrayProxy;
33-
let Namespace = Ember.Namespace;
34-
let ActionHandler = Ember.ActionHandler;
35-
let ControllerMixin = Ember.ControllerMixin;
36-
let CoreObject = Ember.CoreObject;
37-
let Application = Ember.Application;
38-
let MutableArray = Ember.MutableArray;
39-
let MutableEnumerable = Ember.MutableEnumerable;
40-
let NativeArray = Ember.NativeArray;
41-
let Component = Ember.Component;
42-
let Observable = Ember.Observable;
43-
let Evented = Ember.Evented;
44-
let PromiseProxyMixin = Ember.PromiseProxyMixin;
45-
let Service = Ember.Service;
46-
let ObjectProxy = Ember.ObjectProxy;
47-
let VERSION = Ember.VERSION;
48-
let ComputedProperty = Ember.ComputedProperty;
49-
let meta = Ember.meta;
50-
let get = Ember.get;
51-
let set = Ember.set;
52-
let computed = Ember.computed;
53-
let EmberObject = Ember.Object;
54-
let captureRenderTree = Ember._captureRenderTree;
55-
56-
let getEnv = () => Ember.ENV;
32+
let ArrayProxy,
33+
Namespace,
34+
ActionHandler,
35+
ControllerMixin,
36+
CoreObject,
37+
Application,
38+
MutableArray,
39+
MutableEnumerable,
40+
NativeArray,
41+
Component,
42+
Observable,
43+
Evented,
44+
PromiseProxyMixin,
45+
Service,
46+
ObjectProxy,
47+
VERSION,
48+
ComputedProperty,
49+
meta,
50+
get,
51+
set,
52+
computed,
53+
EmberObject,
54+
captureRenderTree,
55+
getEnv;
5756

5857
let Debug = emberSafeRequire('@ember/debug');
5958
let InternalsMetal = emberSafeRequire('@ember/-internals/metal');
@@ -64,15 +63,57 @@ let EmberDestroyable = emberSafeRequire('@ember/destroyable');
6463
let ObjectInternals = emberSafeRequire('@ember/object/internals');
6564
let Instrumentation = emberSafeRequire('@ember/instrumentation');
6665
let Runloop = emberSafeRequire('@ember/runloop');
66+
6767
let RSVP = emberSafeRequire('rsvp');
68+
6869
let GlimmerComponent = emberSafeRequire('@glimmer/component');
6970
let GlimmerManager = emberSafeRequire('@glimmer/manager');
7071
let GlimmerReference = emberSafeRequire('@glimmer/reference');
7172
let GlimmerRuntime = emberSafeRequire('@glimmer/runtime');
7273
let GlimmerUtil = emberSafeRequire('@glimmer/util');
7374
let GlimmerValidator = emberSafeRequire('@glimmer/validator');
7475

75-
if (!Ember) {
76+
let inspect = Debug?.inspect || InternalsUtils?.inspect;
77+
let subscribe = Instrumentation?.subscribe;
78+
let cacheFor = ObjectInternals?.cacheFor;
79+
let guidFor = ObjectInternals?.guidFor;
80+
let libraries = InternalsMetal?.libraries;
81+
82+
if (Ember) {
83+
captureRenderTree = Ember._captureRenderTree;
84+
getEnv = () => Ember.ENV;
85+
ArrayProxy = Ember.ArrayProxy;
86+
ObjectProxy = Ember.ObjectProxy;
87+
MutableArray = Ember.MutableArray;
88+
Namespace = Ember.Namespace;
89+
MutableEnumerable = Ember.MutableEnumerable;
90+
NativeArray = Ember.NativeArray;
91+
ControllerMixin = Ember.ControllerMixin;
92+
CoreObject = Ember.CoreObject;
93+
Application = Ember.Application;
94+
Component = Ember.Component;
95+
Observable = Ember.Observable;
96+
Evented = Ember.Evented;
97+
PromiseProxyMixin = Ember.PromiseProxyMixin;
98+
Service = Ember.Service;
99+
EmberObject = Ember.Object;
100+
VERSION = Ember.VERSION;
101+
ComputedProperty = Ember.ComputedProperty;
102+
meta = Ember.meta;
103+
get = Ember.get;
104+
set = Ember.set;
105+
computed = Ember.computed;
106+
ActionHandler = Ember.ActionHandler;
107+
Debug = Debug ?? Ember.Debug;
108+
inspect = inspect ?? Ember.inspect;
109+
Instrumentation = Instrumentation ?? Ember.Instrumentation;
110+
subscribe = subscribe ?? Ember.subscribe;
111+
RSVP = RSVP ?? Ember.RSVP;
112+
Runloop = Runloop ?? Ember.run;
113+
cacheFor = cacheFor ?? Ember.cacheFor;
114+
guidFor = guidFor ?? Ember.guidFor;
115+
libraries = libraries ?? Ember.libraries;
116+
} else {
76117
captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;
77118
getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
78119
ArrayProxy = emberSafeRequire('@ember/array/proxy')?.default;
@@ -136,6 +177,11 @@ export {
136177
set,
137178
captureRenderTree,
138179
getEnv,
180+
inspect,
181+
subscribe,
182+
cacheFor,
183+
guidFor,
184+
libraries,
139185
GlimmerComponent,
140186
GlimmerManager,
141187
GlimmerReference,

‎ember_debug/utils/ember/debug.js‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎ember_debug/utils/ember/instrumentation.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)