ember-inspector 4.4.1 → 4.5.0

package/ember_debug/render-debug.js

@@ -1,9 +1,9 @@
 // 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';
 
-const { subscribe, Object: EmberObject } = Ember;
+import EmberObject from './utils/ember/object';
+import { subscribe } from './utils/ember/instrumentation';
 
 // Initial setup, that has to occur before the EmberObject init for some reason
 let profileManager = new ProfileManager();
@@ -32,10 +32,14 @@ export default EmberObject.extend(PortMixin, {
 
     this.profileManager.offProfilesAdded(this, this.sendAdded);
     this.profileManager.offProfilesAdded(this, this._updateComponentTree);
+    this.profileManager.teardown();
   },
 
   sendAdded(profiles) {
-    this.sendMessage('profilesAdded', { profiles });
+    this.sendMessage('profilesAdded', {
+      profiles,
+      isHighlightSupported: this.profileManager.isHighlightEnabled,
+    });
   },
 
   /**
@@ -62,6 +66,10 @@ export default EmberObject.extend(PortMixin, {
       });
       this.profileManager.onProfilesAdded(this, this.sendAdded);
     },
+
+    updateShouldHighlightRender({ shouldHighlightRender }) {
+      this.profileManager.shouldHighlightRender = shouldHighlightRender;
+    },
   },
 });
 
@@ -79,7 +87,6 @@ function _subscribeToRenderEvents() {
         payload,
         now: Date.now(),
       };
-
       return profileManager.addToQueue(info);
     },
 

package/ember_debug/route-debug.js

@@ -4,16 +4,11 @@ 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';
 
-const {
-  computed,
-  observer,
-  run: { later },
-  Object: EmberObject,
-  VERSION,
-} = Ember;
-const { readOnly } = computed;
+import Ember from './utils/ember';
+import EmberObject, { computed, observer } from './utils/ember/object';
+import { readOnly } from './utils/ember/object/computed';
+import { later } from './utils/ember/runloop';
 
 const { hasOwnProperty } = Object.prototype;
 
@@ -167,7 +162,7 @@ function buildSubTree(routeTree, route) {
       // 3.9.0 removed intimate APIs from router
       // https://github.com/emberjs/ember.js/pull/17843
       // https://deprecations.emberjs.com/v3.x/#toc_remove-handler-infos
-      if (compareVersion(VERSION, '3.9.0') !== -1) {
+      if (compareVersion(Ember.VERSION, '3.9.0') !== -1) {
         // Ember >= 3.9.0
         routeHandler = routerLib.getRoute(handler);
       } else {

package/ember_debug/services/session.js

@@ -1,6 +1,4 @@
-import Ember from '../utils/ember';
-
-const { Object: EmberObject } = Ember;
+import EmberObject from '../utils/ember/object';
 
 const Session = EmberObject.extend({
   setItem(/*key, val*/) {},

package/ember_debug/utils/ember/application.js

@@ -0,0 +1,11 @@
+import Ember from '.';
+
+let Application;
+
+try {
+  Application = requireModule('@ember/application')['default'];
+} catch {
+  Application = Ember.Application;
+}
+
+export default Application;

package/ember_debug/utils/ember/array/index.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let module;
+
+try {
+  module = requireModule('@ember/array');
+} catch {
+  module = Ember;
+}
+
+export let { A } = module;

package/ember_debug/utils/ember/array/mutable.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let MutableArray;
+
+try {
+  MutableArray = requireModule('@ember/array/mutable')['default'];
+} catch {
+  MutableArray = Ember.MutableArray;
+}
+
+export default MutableArray;

package/ember_debug/utils/ember/array/proxy.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let ArrayProxy;
+
+try {
+  ArrayProxy = requireModule('@ember/array/proxy')['default'];
+} catch {
+  ArrayProxy = Ember.ArrayProxy;
+}
+
+export default ArrayProxy;

package/ember_debug/utils/ember/component.js

@@ -0,0 +1,11 @@
+import Ember from '.';
+
+let Component;
+
+try {
+  Component = requireModule('@ember/component')['default'];
+} catch {
+  Component = Ember.Component;
+}
+
+export default Component;

package/ember_debug/utils/ember/debug.js

@@ -0,0 +1,15 @@
+import Ember from '.';
+
+let module;
+
+export let inspect;
+
+try {
+  module = requireModule('@ember/debug');
+  inspect = module.inspect;
+} catch {
+  module = Ember.Debug;
+  inspect = Ember.inspect;
+}
+
+export let { registerDeprecationHandler } = module;

package/ember_debug/utils/{ember.js → ember/index.js}

@@ -1,4 +1,5 @@
 let Ember;
+
 try {
   Ember = requireModule('ember')['default'];
 } catch {

package/ember_debug/utils/ember/instrumentation.js

@@ -0,0 +1,11 @@
+import Ember from '.';
+
+let module;
+
+try {
+  module = requireModule('@ember/instrumentation');
+} catch {
+  module = Ember;
+}
+
+export let { subscribe } = module;

package/ember_debug/utils/ember/object/computed.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let module;
+
+try {
+  module = requireModule('@ember/object/computed');
+} catch {
+  module = Ember.computed;
+}
+
+export let { alias, equal, oneWay, or, reads, readOnly } = module;

package/ember_debug/utils/ember/object/evented.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let Evented;
+
+try {
+  Evented = requireModule('@ember/object/evented')['default'];
+} catch {
+  Evented = Ember.Evented;
+}
+
+export default Evented;

package/ember_debug/utils/ember/object/index.js

@@ -0,0 +1,15 @@
+import Ember from '..';
+
+let module, EmberObject;
+
+try {
+  module = requireModule('@ember/object');
+  EmberObject = module.default;
+} catch {
+  module = Ember;
+  EmberObject = Ember.Object;
+}
+
+export let { computed, get, observer, set } = module;
+
+export default EmberObject;

package/ember_debug/utils/ember/object/internals.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let module;
+
+try {
+  module = requireModule('@ember/object/internals');
+} catch {
+  module = Ember;
+}
+
+export let { cacheFor, guidFor } = module;

package/ember_debug/utils/ember/object/mixin.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let Mixin;
+
+try {
+  Mixin = requireModule('@ember/object/mixin')['default'];
+} catch {
+  Mixin = Ember.Mixin;
+}
+
+export default Mixin;

package/ember_debug/utils/ember/object/observable.js

@@ -0,0 +1,11 @@
+import Ember from '..';
+
+let Observable;
+
+try {
+  Observable = requireModule('@ember/object/observable')['default'];
+} catch {
+  Observable = Ember.Observable;
+}
+
+export default Observable;

package/ember_debug/utils/ember/object/promise-proxy-mixin.js

@@ -0,0 +1,13 @@
+import Ember from '..';
+
+let PromiseProxyMixin;
+
+try {
+  PromiseProxyMixin = requireModule('@ember/object/promise-proxy-mixin')[
+    'default'
+  ];
+} catch {
+  PromiseProxyMixin = Ember.PromiseProxyMixin;
+}
+
+export default PromiseProxyMixin;

package/ember_debug/utils/ember/runloop.js

@@ -0,0 +1,17 @@
+import Ember from '.';
+
+let module;
+
+export let run;
+export let _backburner;
+
+try {
+  module = requireModule('@ember/runloop');
+  run = module.run;
+  _backburner = module._backburner;
+} catch {
+  module = run = Ember.run;
+  _backburner = Ember.run.backburner;
+}
+
+export let { cancel, debounce, join, later, scheduleOnce } = module;

package/ember_debug/utils/ember/utils.js

@@ -0,0 +1,11 @@
+import Ember from '.';
+
+let module;
+
+try {
+  module = requireModule('@ember/utils');
+} catch {
+  module = Ember;
+}
+
+export let { isNone } = module;

package/ember_debug/utils/rsvp.js

@@ -0,0 +1,14 @@
+import Ember from './ember';
+
+let module, RSVP;
+
+try {
+  module = requireModule('rsvp');
+  RSVP = module.default;
+} catch {
+  module = RSVP = Ember.RSVP;
+}
+
+export let { Promise, all, resolve } = module;
+
+export default RSVP;

package/ember_debug/vendor/startup-wrapper.js

@@ -1,3 +1,10 @@
+let Ember;
+try {
+  Ember = requireModule('ember')['default'];
+} catch {
+  Ember = window.Ember;
+}
+
 /* eslint camelcase:0 */
 /**
  This is a wrapper for `ember-debug.js`
@@ -9,7 +16,7 @@
  Also responsible for sending the first tree.
  **/
 /*eslint prefer-spread: 0 */
-/* globals Ember, adapter, env */
+/* globals adapter, env */
 var currentAdapter = 'basic';
 if (typeof adapter !== 'undefined') {
   currentAdapter = adapter;
@@ -35,8 +42,9 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
       sendVersionMiss();
       return;
     }
+    
     // prevent from injecting twice
-    if (!Ember.EmberInspectorDebugger) {
+    if (!window.EmberInspector) {
       // Make sure we only work for the supported version
       define('ember-debug/config', function() {
         return {
@@ -45,8 +53,9 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
           }
         };
       });
-      window.EmberInspector = Ember.EmberInspectorDebugger = requireModule('ember-debug/main')['default'];
-      Ember.EmberInspectorDebugger.Adapter = requireModule('ember-debug/adapters/' + adapter)['default'];
+      
+      window.EmberInspector = requireModule('ember-debug/main')['default'];
+      window.EmberInspector.Adapter = requireModule('ember-debug/adapters/' + adapter)['default'];
 
       onApplicationStart(function appStarted(instance) {
         let app = instance.application;
@@ -64,15 +73,15 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
           instance.reopen({
             // Clean up on instance destruction
             willDestroy() {
-              if (Ember.EmberInspectorDebugger.get('owner') === instance) {
-                Ember.EmberInspectorDebugger.destroyContainer();
-                Ember.EmberInspectorDebugger.clear();
+              if (window.EmberInspector.get('owner') === instance) {
+                window.EmberInspector.destroyContainer();
+                window.EmberInspector.clear();
               }
               return this._super.apply(this, arguments);
             }
           });
 
-          if (!Ember.EmberInspectorDebugger._application) {
+          if (!window.EmberInspector._application) {
             bootEmberInspector(instance);
           }
         }
@@ -85,9 +94,9 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
     appInstance.__inspector__booted = true;
 
     // Boot the inspector (or re-boot if already booted, for example in tests)
-    Ember.EmberInspectorDebugger.set('_application', appInstance.application);
-    Ember.EmberInspectorDebugger.set('owner', appInstance);
-    Ember.EmberInspectorDebugger.start(true);
+    window.EmberInspector.set('_application', appInstance.application);
+    window.EmberInspector.set('owner', appInstance);
+    window.EmberInspector.start(true);
   }
 
   function onEmberReady(callback) {
@@ -146,7 +155,7 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
       }
 
       if (message.type === 'app-selected') {
-        let current = Ember.EmberInspectorDebugger._application;
+        let current = window.EmberInspector._application;
         let selected = getApplications().find(app => Ember.guidFor(app) === message.applicationId);
 
         if (current !== selected && selected.__deprecatedInstance__) {

package/ember_debug/view-debug.js

@@ -4,10 +4,9 @@ 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';
-import Ember from './utils/ember';
 
-const { computed, Object: EmberObject } = Ember;
-const { readOnly } = computed;
+import EmberObject from './utils/ember/object';
+import { readOnly } from './utils/ember/object/computed';
 
 export default EmberObject.extend(PortMixin, {
   namespace: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-inspector",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "description": "Extends developer tools to allow you to better inspect your Ember.js apps.",
   "repository": "https://github.com/emberjs/ember-inspector",
   "license": "MIT",
@@ -14,7 +14,7 @@
     "build:production": "EMBER_ENV=production node scripts/download-panes.js && ember build --environment production && gulp compress:chrome && gulp compress:firefox && gulp clean-tmp",
     "changelog": "github_changelog_generator -u emberjs -p ember-inspector --since-tag v3.8.0",
     "compress:panes": "gulp compress:chrome-pane && gulp compress:firefox-pane && gulp compress:bookmarklet-pane",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
@@ -32,13 +32,14 @@
     "@babel/helper-call-delegate": "^7.12.13",
     "@ember/edition-utils": "^1.2.0",
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^1.0.2",
-    "@ember/string": "^1.0.0",
+    "@ember/render-modifiers": "^2.0.0",
+    "@ember/string": "^3.0.0",
+    "@ember/test-helpers": "^2.5.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@html-next/vertical-collection": "^2.0.0",
+    "@html-next/vertical-collection": "html-next/vertical-collection#79e7b1aa31b3e292db06df79d845cb5a6a0c1b40",
     "amd-name-resolver": "^1.3.1",
-    "aws-sdk": "^2.863.0",
+    "aws-sdk": "^2.978.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-es2015-modules-amd": "^6.24.0",
@@ -52,49 +53,49 @@
     "broccoli-stew": "^3.0.0",
     "broccoli-string-replace": "^0.1.2",
     "codeclimate-test-reporter": "^0.5.1",
-    "compare-versions": "^3.5.0",
+    "compare-versions": "^4.0.0",
     "del": "^6.0.0",
-    "ember-auto-import": "^1.11.3",
-    "ember-cli": "~3.26.1",
+    "ember-auto-import": "^2.1.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.5",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-code-coverage": "^1.0.2",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-deprecation-workflow": "^1.0.1",
-    "ember-cli-htmlbars": "^5.7.1",
-    "ember-cli-inject-live-reload": "^2.0.2",
+    "ember-cli-deprecation-workflow": "^2.0.0",
+    "ember-cli-htmlbars": "^6.0.0",
+    "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^10.0.0",
-    "ember-cli-shims": "^1.2.0",
-    "ember-cli-showdown": "^4.5.0",
     "ember-cli-stylelint": "^4.0.0",
-    "ember-cli-terser": "^4.0.1",
+    "ember-cli-terser": "^4.0.2",
     "ember-cli-version-checker": "^5.1.2",
     "ember-concurrency": "^2.0.3",
     "ember-decorators": "^6.1.1",
     "ember-did-resize-modifier": "^1.0.0",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.0.4",
-    "ember-flatpickr": "^2.16.4",
+    "ember-fetch": "^8.1.1",
+    "ember-flatpickr": "^3.2.2",
+    "ember-in-element-polyfill": "^1.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-math-helpers": "^2.15.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-page-title": "^6.2.1",
-    "ember-qunit": "^4.6.0",
+    "ember-maybe-import-regenerator": "^1.0.0",
+    "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.27.0",
+    "ember-showdown": "^1.0.0-beta.1",
+    "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-svg-jar": "^2.3.3",
-    "ember-table": "^3.0.1",
-    "ember-template-lint": "^3.2.0",
-    "ember-test-selectors": "^5.2.0",
+    "ember-table": "rwwagner90/ember-table#42607a07cad1c247f6e6d1617d33119d325cbce5",
+    "ember-template-lint": "^3.6.0",
+    "ember-test-selectors": "^6.0.0",
     "ember-truth-helpers": "^3.0.0",
     "ember-try": "^1.1.0",
     "ensure-posix-path": "^1.1.1",
-    "eslint": "^7.23.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-ember": "^10.4.2",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "fstream": "^1.0.12",
     "got": "^11.8.2",
     "gulp": "^4.0.2",
@@ -103,18 +104,23 @@
     "normalize.css": "8.0.1",
     "npm-run-all": "^4.1.5",
     "pretender": "^3.4.3",
-    "prettier": "^2.3.0",
-    "qunit-dom": "^1.6.0",
+    "prettier": "^2.3.2",
+    "qunit": "^2.16.0",
+    "qunit-dom": "^2.0.0",
     "release-it": "^14.6.1",
-    "release-it-lerna-changelog": "^3.1.0",
+    "release-it-lerna-changelog": "^4.0.1",
     "rimraf": "^3.0.0",
-    "sass": "^1.32.13",
-    "stylelint": "^13.13.0",
+    "sass": "^1.38.2",
+    "stylelint": "^14.0.0",
     "stylelint-config-ship-shape": "^0.7.0",
+    "webpack": "^5.51.1",
     "yauzl": "^2.10.0"
   },
+  "resolutions": {
+    "socket.io": "^4.3.1"
+  },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -154,7 +160,7 @@
     }
   },
   "volta": {
-    "node": "12.22.1",
-    "yarn": "1.22.0"
+    "node": "12.22.7",
+    "yarn": "1.22.11"
   }
 }

package/tests/acceptance/app-picker-test.js

@@ -72,7 +72,7 @@ module('App Picker', function (hooks) {
 
     assert.equal(this.currentApplicationId, 'app-one', 'First App is selected');
     assert.ok(options[0].selected, 'First App is selected');
-    assert.ok(!options[1].selected, 'Second App is not selected');
+    assert.notOk(options[1].selected, 'Second App is not selected');
 
     await fillIn('.app-picker select', 'app-two');
 
@@ -85,7 +85,7 @@ module('App Picker', function (hooks) {
       'app-two',
       'Second App is selected'
     );
-    assert.ok(!options[0].selected, 'First App is not selected');
+    assert.notOk(options[0].selected, 'First App is not selected');
     assert.ok(options[1].selected, 'Second App is selected');
 
     await fillIn('.app-picker select', 'app-one');
@@ -96,6 +96,6 @@ module('App Picker', function (hooks) {
 
     assert.equal(this.currentApplicationId, 'app-one', 'First App is selected');
     assert.ok(options[0].selected, 'First App is selected');
-    assert.ok(!options[1].selected, 'Second App is not selected');
+    assert.notOk(options[1].selected, 'Second App is not selected');
   });
 });