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

ember lookup util #1559

Merged
merged 1 commit into from
Apr 29, 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
7 changes: 1 addition & 6 deletions ember_debug/adapters/basic.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
7 changes: 1 addition & 6 deletions ember_debug/adapters/web-extension.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/adapters/websocket.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/container-debug.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
7 changes: 1 addition & 6 deletions ember_debug/data-debug.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
7 changes: 1 addition & 6 deletions ember_debug/deprecation-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/general-debug.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 1 addition & 7 deletions ember_debug/libs/capture-render-tree.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 1 addition & 6 deletions ember_debug/libs/promise-assembler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/libs/source-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 1 addition & 6 deletions ember_debug/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/mixins/port-mixin.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/models/profile-manager.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/models/profile-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/models/promise.js
Original file line number Diff line number Diff line change
@@ -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 () {
Expand Down
7 changes: 1 addition & 6 deletions ember_debug/object-inspector.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 1 addition & 6 deletions ember_debug/port.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 2 additions & 6 deletions ember_debug/promise-debug.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
7 changes: 1 addition & 6 deletions ember_debug/render-debug.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 1 addition & 6 deletions ember_debug/route-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions ember_debug/services/session.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
8 changes: 8 additions & 0 deletions ember_debug/utils/ember.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
let Ember;
try {
Ember = requireModule('ember')['default'];
} catch {
Ember = window.Ember;
}

export default Ember;
7 changes: 1 addition & 6 deletions ember_debug/utils/type-check.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
let Ember;
try {
Ember = requireModule('ember')['default'];
} catch {
Ember = window.Ember;
}
import Ember from './ember';
const { ComputedProperty } = Ember;

/**
Expand Down
8 changes: 1 addition & 7 deletions ember_debug/view-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down