Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ember-debug imports #1844

Merged
merged 1 commit into from
Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ember_debug/adapters/basic.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions ember_debug/adapters/web-extension.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ember_debug/adapters/websocket.js
Original file line number Diff line number Diff line change
@@ -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 = {}) {
Expand Down
4 changes: 2 additions & 2 deletions ember_debug/container-debug.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 4 additions & 4 deletions ember_debug/data-debug.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ember_debug/debug-port.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EmberObject from './utils/ember/object';
import EmberObject from 'ember-debug/utils/ember/object';

export default EmberObject.extend({
port: null,
Expand Down
14 changes: 7 additions & 7 deletions ember_debug/deprecation-debug.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ember_debug/general-debug.js
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ember_debug/libs/capture-render-tree.js
Original file line number Diff line number Diff line change
@@ -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 */

Expand Down
10 changes: 5 additions & 5 deletions ember_debug/libs/promise-assembler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ember_debug/libs/source-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/libs/view-inspection.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions ember_debug/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ember_debug/models/profile-manager.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ember_debug/models/profile-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ember_debug/models/promise.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
33 changes: 18 additions & 15 deletions ember_debug/object-inspector.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions ember_debug/port.js
Original file line number Diff line number Diff line change
@@ -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'),
Expand Down
10 changes: 5 additions & 5 deletions ember_debug/promise-debug.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ember_debug/render-debug.js
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
8 changes: 4 additions & 4 deletions ember_debug/route-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/services/session.js
Original file line number Diff line number Diff line change
@@ -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*/) {},
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '.';
import Ember from '../ember';

let Application;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../ember';

let module;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/array/mutable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let MutableArray;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/array/proxy.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let ArrayProxy;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/component.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '.';
import Ember from '../ember';

let Component;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/debug.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '.';
import Ember from '../ember';

let module;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/instrumentation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '.';
import Ember from '../ember';

let module;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../ember';

let module, EmberObject;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/object/computed.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let module;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/object/evented.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let Evented;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/object/internals.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let module;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/object/mixin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let Mixin;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/object/observable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let Observable;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/object/promise-proxy-mixin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '..';
import Ember from '../../ember';

let PromiseProxyMixin;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/runloop.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '.';
import Ember from '../ember';

let module;

Expand Down
2 changes: 1 addition & 1 deletion ember_debug/utils/ember/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from '.';
import Ember from '../ember';

let module;

Expand Down
Loading