diff --git a/ember_debug/adapters/basic.js b/ember_debug/adapters/basic.js index ccbdd6c598..4743581481 100644 --- a/ember_debug/adapters/basic.js +++ b/ember_debug/adapters/basic.js @@ -1,9 +1,9 @@ /* eslint no-console: 0 */ -import { onReady } from '../utils/on-ready'; +import { onReady } from 'ember-debug/utils/on-ready'; -import { A } from '../utils/ember/array'; -import EmberObject, { computed } from '../utils/ember/object'; -import { Promise, resolve } from '../utils/rsvp'; +import { A } from 'ember-debug/utils/ember/array'; +import EmberObject, { computed } from 'ember-debug/utils/ember/object'; +import { Promise, resolve } from 'ember-debug/utils/rsvp'; export default EmberObject.extend({ init() { diff --git a/ember_debug/adapters/web-extension.js b/ember_debug/adapters/web-extension.js index 595eb131b1..7c2606ead1 100644 --- a/ember_debug/adapters/web-extension.js +++ b/ember_debug/adapters/web-extension.js @@ -1,8 +1,8 @@ import BasicAdapter from './basic'; -import { typeOf } from '../utils/type-check'; +import { typeOf } from 'ember-debug/utils/type-check'; -import Ember from '../utils/ember'; -import { run } from '../utils/ember/runloop'; +import Ember from 'ember-debug/utils/ember'; +import { run } from 'ember-debug/utils/ember/runloop'; const { isArray } = Array; const { keys } = Object; diff --git a/ember_debug/adapters/websocket.js b/ember_debug/adapters/websocket.js index f91ba42ad6..8288210163 100644 --- a/ember_debug/adapters/websocket.js +++ b/ember_debug/adapters/websocket.js @@ -1,9 +1,9 @@ import BasicAdapter from './basic'; -import { onReady } from '../utils/on-ready'; +import { onReady } from 'ember-debug/utils/on-ready'; -import { computed } from '../utils/ember/object'; -import { run } from '../utils/ember/runloop'; -import { Promise } from '../utils/rsvp'; +import { computed } from 'ember-debug/utils/ember/object'; +import { run } from 'ember-debug/utils/ember/runloop'; +import { Promise } from 'ember-debug/utils/rsvp'; export default BasicAdapter.extend({ sendMessage(options = {}) { diff --git a/ember_debug/container-debug.js b/ember_debug/container-debug.js index 35c49f6171..79a78d2092 100644 --- a/ember_debug/container-debug.js +++ b/ember_debug/container-debug.js @@ -1,7 +1,7 @@ import DebugPort from './debug-port'; -import { computed } from './utils/ember/object'; -import { reads, readOnly } from './utils/ember/object/computed'; +import { computed } from 'ember-debug/utils/ember/object'; +import { reads, readOnly } from 'ember-debug/utils/ember/object/computed'; export default DebugPort.extend({ namespace: null, diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js index 43f46671ef..31ba369611 100644 --- a/ember_debug/data-debug.js +++ b/ember_debug/data-debug.js @@ -1,9 +1,9 @@ import DebugPort from './debug-port'; -import { A } from './utils/ember/array'; -import { computed, set } from './utils/ember/object'; -import { alias } from './utils/ember/object/computed'; -import { guidFor } from './utils/ember/object/internals'; +import { A } from 'ember-debug/utils/ember/array'; +import { computed, set } from 'ember-debug/utils/ember/object'; +import { alias } from 'ember-debug/utils/ember/object/computed'; +import { guidFor } from 'ember-debug/utils/ember/object/internals'; export default DebugPort.extend({ init() { diff --git a/ember_debug/debug-port.js b/ember_debug/debug-port.js index 04c319fff6..0704000d5b 100644 --- a/ember_debug/debug-port.js +++ b/ember_debug/debug-port.js @@ -1,4 +1,4 @@ -import EmberObject from './utils/ember/object'; +import EmberObject from 'ember-debug/utils/ember/object'; export default EmberObject.extend({ port: null, diff --git a/ember_debug/deprecation-debug.js b/ember_debug/deprecation-debug.js index fcbd6f580b..7b3c3cd827 100644 --- a/ember_debug/deprecation-debug.js +++ b/ember_debug/deprecation-debug.js @@ -1,13 +1,13 @@ import DebugPort from './debug-port'; import SourceMap from 'ember-debug/libs/source-map'; -import { A } from './utils/ember/array'; -import { registerDeprecationHandler } from './utils/ember/debug'; -import { computed } from './utils/ember/object'; -import { readOnly } from './utils/ember/object/computed'; -import { guidFor } from './utils/ember/object/internals'; -import { cancel, debounce } from './utils/ember/runloop'; -import { all, resolve } from './utils/rsvp'; +import { A } from 'ember-debug/utils/ember/array'; +import { registerDeprecationHandler } from 'ember-debug/utils/ember/debug'; +import { computed } from 'ember-debug/utils/ember/object'; +import { readOnly } from 'ember-debug/utils/ember/object/computed'; +import { guidFor } from 'ember-debug/utils/ember/object/internals'; +import { cancel, debounce } from 'ember-debug/utils/ember/runloop'; +import { all, resolve } from 'ember-debug/utils/rsvp'; export default DebugPort.extend({ portNamespace: 'deprecation', diff --git a/ember_debug/general-debug.js b/ember_debug/general-debug.js index ce99afb8f4..63b97d4de4 100644 --- a/ember_debug/general-debug.js +++ b/ember_debug/general-debug.js @@ -1,7 +1,7 @@ /* eslint no-empty:0 */ import DebugPort from './debug-port'; -import Ember from './utils/ember'; +import Ember from 'ember-debug/utils/ember'; /** * Class that handles gathering general information of the inspected app. diff --git a/ember_debug/libs/capture-render-tree.js b/ember_debug/libs/capture-render-tree.js index 91c62d297b..9034a69b19 100644 --- a/ember_debug/libs/capture-render-tree.js +++ b/ember_debug/libs/capture-render-tree.js @@ -1,5 +1,5 @@ -import { compareVersion } from '../utils/version'; -import Ember from '../utils/ember'; +import { compareVersion } from 'ember-debug/utils/version'; +import Ember from 'ember-debug/utils/ember'; /* eslint-disable no-console, no-inner-declarations */ diff --git a/ember_debug/libs/promise-assembler.js b/ember_debug/libs/promise-assembler.js index 4466dc2620..993aa216df 100644 --- a/ember_debug/libs/promise-assembler.js +++ b/ember_debug/libs/promise-assembler.js @@ -7,11 +7,11 @@ import Promise from 'ember-debug/models/promise'; -import { A } from '../utils/ember/array'; -import EmberObject from '../utils/ember/object'; -import Evented from '../utils/ember/object/evented'; -import { isNone } from '../utils/ember/utils'; -import RSVP from '../utils/rsvp'; +import { A } from 'ember-debug/utils/ember/array'; +import EmberObject from 'ember-debug/utils/ember/object'; +import Evented from 'ember-debug/utils/ember/object/evented'; +import { isNone } from 'ember-debug/utils/ember/utils'; +import RSVP from 'ember-debug/utils/rsvp'; let PromiseAssembler = EmberObject.extend(Evented, { // RSVP lib to debug diff --git a/ember_debug/libs/source-map.js b/ember_debug/libs/source-map.js index ae055c2a93..c3409c0bb5 100644 --- a/ember_debug/libs/source-map.js +++ b/ember_debug/libs/source-map.js @@ -3,9 +3,9 @@ * A lot of the code is inspired by/taken from * https://github.com/evanw/node-source-map-support */ -import { A } from '../utils/ember/array'; -import EmberObject, { computed } from '../utils/ember/object'; -import { Promise, resolve } from '../utils/rsvp'; +import { A } from 'ember-debug/utils/ember/array'; +import EmberObject, { computed } from 'ember-debug/utils/ember/object'; +import { Promise, resolve } from 'ember-debug/utils/rsvp'; const notFoundError = new Error('Source map url not found'); diff --git a/ember_debug/libs/view-inspection.js b/ember_debug/libs/view-inspection.js index 4f34149192..43cbfa9cdb 100644 --- a/ember_debug/libs/view-inspection.js +++ b/ember_debug/libs/view-inspection.js @@ -1,4 +1,4 @@ -import classify from '../utils/classify'; +import classify from 'ember-debug/utils/classify'; import bound from 'ember-debug/utils/bound-method'; function makeHighlight(id) { diff --git a/ember_debug/main.js b/ember_debug/main.js index 493b47201f..66252cc136 100644 --- a/ember_debug/main.js +++ b/ember_debug/main.js @@ -11,12 +11,12 @@ 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'; -import Application from './utils/ember/application'; -import EmberObject, { computed } from './utils/ember/object'; -import { or } from './utils/ember/object/computed'; -import { guidFor } from './utils/ember/object/internals'; -import { run } from './utils/ember/runloop'; +import Ember from 'ember-debug/utils/ember'; +import Application from 'ember-debug/utils/ember/application'; +import EmberObject, { computed } from 'ember-debug/utils/ember/object'; +import { or } from 'ember-debug/utils/ember/object/computed'; +import { guidFor } from 'ember-debug/utils/ember/object/internals'; +import { run } from 'ember-debug/utils/ember/runloop'; const { Namespace } = Ember; diff --git a/ember_debug/models/profile-manager.js b/ember_debug/models/profile-manager.js index 7b76e39ab9..1e737a35fb 100644 --- a/ember_debug/models/profile-manager.js +++ b/ember_debug/models/profile-manager.js @@ -1,8 +1,8 @@ import ProfileNode from './profile-node'; -import Ember from '../utils/ember'; +import Ember from 'ember-debug/utils/ember'; import { compareVersion } from 'ember-debug/utils/version'; -import { later, scheduleOnce, cancel } from '../utils/ember/runloop'; +import { later, scheduleOnce, cancel } from 'ember-debug/utils/ember/runloop'; function getEdges(first, last, closest) { let start = null; diff --git a/ember_debug/models/profile-node.js b/ember_debug/models/profile-node.js index f2154c109c..419615a6ac 100644 --- a/ember_debug/models/profile-node.js +++ b/ember_debug/models/profile-node.js @@ -3,8 +3,8 @@ @class ProfileNode **/ -import { get } from '../utils/ember/object'; -import { guidFor } from '../utils/ember/object/internals'; +import { get } from 'ember-debug/utils/ember/object'; +import { guidFor } from 'ember-debug/utils/ember/object/internals'; const ProfileNode = function (start, payload, parent, now) { let name; this.start = start; diff --git a/ember_debug/models/promise.js b/ember_debug/models/promise.js index cbfe92deb7..aeef137dd2 100644 --- a/ember_debug/models/promise.js +++ b/ember_debug/models/promise.js @@ -1,8 +1,8 @@ -import { typeOf } from '../utils/type-check'; +import { typeOf } from 'ember-debug/utils/type-check'; -import { A } from '../utils/ember/array'; -import EmberObject, { computed } from '../utils/ember/object'; -import { equal, or } from '../utils/ember/object/computed'; +import { A } from 'ember-debug/utils/ember/array'; +import EmberObject, { computed } from 'ember-debug/utils/ember/object'; +import { equal, or } from 'ember-debug/utils/ember/object/computed'; const dateComputed = function () { return computed({ diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js index 98c88b6287..73800496dc 100644 --- a/ember_debug/object-inspector.js +++ b/ember_debug/object-inspector.js @@ -5,23 +5,26 @@ import { isComputed, isDescriptor, getDescriptorFor, + typeOf, } from 'ember-debug/utils/type-check'; import { compareVersion } from 'ember-debug/utils/version'; -import { typeOf } from './utils/type-check'; - -import Ember from './utils/ember'; -import MutableArray from './utils/ember/array/mutable'; -import ArrayProxy from './utils/ember/array/proxy'; -import Component from './utils/ember/component'; -import { inspect as emberInspect } from './utils/ember/debug'; -import EmberObject, { computed, get, set } from './utils/ember/object'; -import { oneWay } from './utils/ember/object/computed'; -import Observable from './utils/ember/object/observable'; -import Evented from './utils/ember/object/evented'; -import { cacheFor, guidFor } from './utils/ember/object/internals'; -import PromiseProxyMixin from './utils/ember/object/promise-proxy-mixin'; -import { _backburner, join } from './utils/ember/runloop'; -import { isNone } from './utils/ember/utils'; +import Ember from 'ember-debug/utils/ember'; +import MutableArray from 'ember-debug/utils/ember/array/mutable'; +import ArrayProxy from 'ember-debug/utils/ember/array/proxy'; +import Component from 'ember-debug/utils/ember/component'; +import { inspect as emberInspect } from 'ember-debug/utils/ember/debug'; +import EmberObject, { + computed, + get, + set, +} from 'ember-debug/utils/ember/object'; +import { oneWay } from 'ember-debug/utils/ember/object/computed'; +import Observable from 'ember-debug/utils/ember/object/observable'; +import Evented from 'ember-debug/utils/ember/object/evented'; +import { cacheFor, guidFor } from 'ember-debug/utils/ember/object/internals'; +import PromiseProxyMixin from 'ember-debug/utils/ember/object/promise-proxy-mixin'; +import { _backburner, join } from 'ember-debug/utils/ember/runloop'; +import { isNone } from 'ember-debug/utils/ember/utils'; const { meta: emberMeta, diff --git a/ember_debug/port.js b/ember_debug/port.js index 52d9c8b655..3c25d94cf6 100644 --- a/ember_debug/port.js +++ b/ember_debug/port.js @@ -1,8 +1,8 @@ -import EmberObject, { computed } from './utils/ember/object'; -import { or, readOnly } from './utils/ember/object/computed'; -import Evented from './utils/ember/object/evented'; -import { guidFor } from './utils/ember/object/internals'; -import { run } from './utils/ember/runloop'; +import EmberObject, { computed } from 'ember-debug/utils/ember/object'; +import { or, readOnly } from 'ember-debug/utils/ember/object/computed'; +import Evented from 'ember-debug/utils/ember/object/evented'; +import { guidFor } from 'ember-debug/utils/ember/object/internals'; +import { run } from 'ember-debug/utils/ember/runloop'; export default EmberObject.extend(Evented, { adapter: readOnly('namespace.adapter'), diff --git a/ember_debug/promise-debug.js b/ember_debug/promise-debug.js index c3ab61279b..8e31b750d4 100644 --- a/ember_debug/promise-debug.js +++ b/ember_debug/promise-debug.js @@ -1,11 +1,11 @@ import DebugPort from './debug-port'; import PromiseAssembler from 'ember-debug/libs/promise-assembler'; -import { A } from './utils/ember/array'; -import { computed } from './utils/ember/object'; -import { readOnly } from './utils/ember/object/computed'; -import { debounce } from './utils/ember/runloop'; -import RSVP from './utils/rsvp'; +import { A } from 'ember-debug/utils/ember/array'; +import { computed } from 'ember-debug/utils/ember/object'; +import { readOnly } from 'ember-debug/utils/ember/object/computed'; +import { debounce } from 'ember-debug/utils/ember/runloop'; +import RSVP from 'ember-debug/utils/rsvp'; export default DebugPort.extend({ namespace: null, diff --git a/ember_debug/render-debug.js b/ember_debug/render-debug.js index 1465250dc5..8a832e3dd0 100644 --- a/ember_debug/render-debug.js +++ b/ember_debug/render-debug.js @@ -1,7 +1,7 @@ import DebugPort from './debug-port'; import ProfileManager from './models/profile-manager'; -import { subscribe } from './utils/ember/instrumentation'; +import { subscribe } from 'ember-debug/utils/ember/instrumentation'; // Initial setup, that has to occur before the EmberObject init for some reason let profileManager = new ProfileManager(); diff --git a/ember_debug/route-debug.js b/ember_debug/route-debug.js index 91973e495c..75c66ccd95 100644 --- a/ember_debug/route-debug.js +++ b/ember_debug/route-debug.js @@ -4,10 +4,10 @@ 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'; -import { computed, observer } from './utils/ember/object'; -import { readOnly } from './utils/ember/object/computed'; -import { later } from './utils/ember/runloop'; +import Ember from 'ember-debug/utils/ember'; +import { computed, observer } from 'ember-debug/utils/ember/object'; +import { readOnly } from 'ember-debug/utils/ember/object/computed'; +import { later } from 'ember-debug/utils/ember/runloop'; const { hasOwnProperty } = Object.prototype; diff --git a/ember_debug/services/session.js b/ember_debug/services/session.js index 9295fcba08..27ded611d5 100644 --- a/ember_debug/services/session.js +++ b/ember_debug/services/session.js @@ -1,4 +1,4 @@ -import EmberObject from '../utils/ember/object'; +import EmberObject from 'ember-debug/utils/ember/object'; const Session = EmberObject.extend({ setItem(/*key, val*/) {}, diff --git a/ember_debug/utils/ember/index.js b/ember_debug/utils/ember.js similarity index 100% rename from ember_debug/utils/ember/index.js rename to ember_debug/utils/ember.js diff --git a/ember_debug/utils/ember/application.js b/ember_debug/utils/ember/application.js index 985a6aab76..dc2cddebe8 100644 --- a/ember_debug/utils/ember/application.js +++ b/ember_debug/utils/ember/application.js @@ -1,4 +1,4 @@ -import Ember from '.'; +import Ember from '../ember'; let Application; diff --git a/ember_debug/utils/ember/array/index.js b/ember_debug/utils/ember/array.js similarity index 80% rename from ember_debug/utils/ember/array/index.js rename to ember_debug/utils/ember/array.js index f8f3a65e60..03dd4d3e31 100644 --- a/ember_debug/utils/ember/array/index.js +++ b/ember_debug/utils/ember/array.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../ember'; let module; diff --git a/ember_debug/utils/ember/array/mutable.js b/ember_debug/utils/ember/array/mutable.js index 4e0a15cd45..c7ebf0f450 100644 --- a/ember_debug/utils/ember/array/mutable.js +++ b/ember_debug/utils/ember/array/mutable.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let MutableArray; diff --git a/ember_debug/utils/ember/array/proxy.js b/ember_debug/utils/ember/array/proxy.js index 52b9806622..cbd8a7ef17 100644 --- a/ember_debug/utils/ember/array/proxy.js +++ b/ember_debug/utils/ember/array/proxy.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let ArrayProxy; diff --git a/ember_debug/utils/ember/component.js b/ember_debug/utils/ember/component.js index dabb49034c..a8d9703c12 100644 --- a/ember_debug/utils/ember/component.js +++ b/ember_debug/utils/ember/component.js @@ -1,4 +1,4 @@ -import Ember from '.'; +import Ember from '../ember'; let Component; diff --git a/ember_debug/utils/ember/debug.js b/ember_debug/utils/ember/debug.js index 1a3b33f1b4..21a3766aa1 100644 --- a/ember_debug/utils/ember/debug.js +++ b/ember_debug/utils/ember/debug.js @@ -1,4 +1,4 @@ -import Ember from '.'; +import Ember from '../ember'; let module; diff --git a/ember_debug/utils/ember/instrumentation.js b/ember_debug/utils/ember/instrumentation.js index 427184da0b..9d4cc070c0 100644 --- a/ember_debug/utils/ember/instrumentation.js +++ b/ember_debug/utils/ember/instrumentation.js @@ -1,4 +1,4 @@ -import Ember from '.'; +import Ember from '../ember'; let module; diff --git a/ember_debug/utils/ember/object/index.js b/ember_debug/utils/ember/object.js similarity index 89% rename from ember_debug/utils/ember/object/index.js rename to ember_debug/utils/ember/object.js index ae5e225555..af6cb22ee5 100644 --- a/ember_debug/utils/ember/object/index.js +++ b/ember_debug/utils/ember/object.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../ember'; let module, EmberObject; diff --git a/ember_debug/utils/ember/object/computed.js b/ember_debug/utils/ember/object/computed.js index 0aa24ebc23..250c3a1aaf 100644 --- a/ember_debug/utils/ember/object/computed.js +++ b/ember_debug/utils/ember/object/computed.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let module; diff --git a/ember_debug/utils/ember/object/evented.js b/ember_debug/utils/ember/object/evented.js index fb1b318aed..68d4c142c3 100644 --- a/ember_debug/utils/ember/object/evented.js +++ b/ember_debug/utils/ember/object/evented.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let Evented; diff --git a/ember_debug/utils/ember/object/internals.js b/ember_debug/utils/ember/object/internals.js index 5b06b6e949..9023b53ca9 100644 --- a/ember_debug/utils/ember/object/internals.js +++ b/ember_debug/utils/ember/object/internals.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let module; diff --git a/ember_debug/utils/ember/object/mixin.js b/ember_debug/utils/ember/object/mixin.js index 58790a3ec5..b99002aabf 100644 --- a/ember_debug/utils/ember/object/mixin.js +++ b/ember_debug/utils/ember/object/mixin.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let Mixin; diff --git a/ember_debug/utils/ember/object/observable.js b/ember_debug/utils/ember/object/observable.js index 5029b6927e..1c8c3abbca 100644 --- a/ember_debug/utils/ember/object/observable.js +++ b/ember_debug/utils/ember/object/observable.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let Observable; diff --git a/ember_debug/utils/ember/object/promise-proxy-mixin.js b/ember_debug/utils/ember/object/promise-proxy-mixin.js index 9afde5103b..8c1ea9cdfb 100644 --- a/ember_debug/utils/ember/object/promise-proxy-mixin.js +++ b/ember_debug/utils/ember/object/promise-proxy-mixin.js @@ -1,4 +1,4 @@ -import Ember from '..'; +import Ember from '../../ember'; let PromiseProxyMixin; diff --git a/ember_debug/utils/ember/runloop.js b/ember_debug/utils/ember/runloop.js index b436deb236..334b9fe02b 100644 --- a/ember_debug/utils/ember/runloop.js +++ b/ember_debug/utils/ember/runloop.js @@ -1,4 +1,4 @@ -import Ember from '.'; +import Ember from '../ember'; let module; diff --git a/ember_debug/utils/ember/utils.js b/ember_debug/utils/ember/utils.js index dcd26fac44..96348f7bcf 100644 --- a/ember_debug/utils/ember/utils.js +++ b/ember_debug/utils/ember/utils.js @@ -1,4 +1,4 @@ -import Ember from '.'; +import Ember from '../ember'; let module; diff --git a/ember_debug/view-debug.js b/ember_debug/view-debug.js index f5a1c22a5a..a01ca77a06 100644 --- a/ember_debug/view-debug.js +++ b/ember_debug/view-debug.js @@ -4,7 +4,7 @@ import RenderTree from 'ember-debug/libs/render-tree'; import ViewInspection from 'ember-debug/libs/view-inspection'; import bound from 'ember-debug/utils/bound-method'; -import { readOnly } from './utils/ember/object/computed'; +import { readOnly } from 'ember-debug/utils/ember/object/computed'; export default DebugPort.extend({ namespace: null,