ember-inspector 4.13.1-alpha.2025.6.9 → 4.13.1-alpha.2025.7.2

package/dist/websocket/index.html

@@ -8,7 +8,7 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <meta name="ember-inspector/config/environment" content="%7B%22modulePrefix%22%3A%22ember-inspector%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22hash%22%2C%22version%22%3A%224.13.1-alpha.2025.6.9%2Bf3062c3%22%2C%22emberVersionsSupported%22%3A%5B%223.16.0%22%2C%22%22%5D%2C%22previousEmberVersionsSupported%22%3A%5B%220.0.0%22%2C%222.7.0%22%2C%223.4.0%22%5D%2C%22EmberENV%22%3A%7B%22EXTEND_PROTOTYPES%22%3Afalse%2C%22FEATURES%22%3A%7B%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_NO_IMPLICIT_ROUTE_MODEL%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22ember-inspector%22%2C%22version%22%3A%224.13.1-alpha.2025.6.9%2Bf3062c3%2Bf3062c3c%22%7D%7D" />
+    <meta name="ember-inspector/config/environment" content="%7B%22modulePrefix%22%3A%22ember-inspector%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22hash%22%2C%22version%22%3A%224.13.1-alpha.2025.7.2%2Be8dd6fa%22%2C%22emberVersionsSupported%22%3A%5B%223.16.0%22%2C%22%22%5D%2C%22previousEmberVersionsSupported%22%3A%5B%220.0.0%22%2C%222.7.0%22%2C%223.4.0%22%5D%2C%22EmberENV%22%3A%7B%22EXTEND_PROTOTYPES%22%3Afalse%2C%22FEATURES%22%3A%7B%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_NO_IMPLICIT_ROUTE_MODEL%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22ember-inspector%22%2C%22version%22%3A%224.13.1-alpha.2025.7.2%2Be8dd6fa%2Be8dd6fa0%22%7D%7D" />
 
     <style type="text/css">
       @font-face {
@@ -38,7 +38,7 @@
 
     <script src="assets/vendor.js"></script>
 <script src="assets/chunk.443.86a005e528b587663b78.js"></script>
-<script src="assets/chunk.524.d19cdd28d1fc1598d913.js"></script>
+<script src="assets/chunk.524.13916f328fdeb048a99e.js"></script>
     <script src="assets/ember-inspector.js"></script>
 
     

package/ember-cli-build.js

@@ -7,13 +7,7 @@ const concatFiles = require('broccoli-concat');
 const stew = require('broccoli-stew');
 const writeFile = require('broccoli-file-creator');
 const replace = require('broccoli-string-replace');
-const Babel = require('broccoli-babel-transpiler');
-const moduleResolver = require('amd-name-resolver').resolveModules({
-  throwOnRootAccess: false,
-});
 const Funnel = require('broccoli-funnel');
-const ensurePosix = require('ensure-posix-path');
-const path = require('path');
 const packageJson = require('./package.json');
 const { map, mv } = stew;
 
@@ -33,16 +27,6 @@ const options = {
 options.minifyJS = { enabled: false };
 options.minifyCSS = { enabled: false };
 
-// Stolen from relative-module-paths.js in ember-cli-babel
-function getRelativeModulePath(modulePath) {
-  return ensurePosix(path.relative(process.cwd(), modulePath));
-}
-
-// Stolen from relative-module-paths.js in ember-cli-babel
-function resolveRelativeModulePath(name, child) {
-  return moduleResolver(name, getRelativeModulePath(child));
-}
-
 module.exports = function (defaults) {
   let checker = new VersionChecker(defaults);
   let emberChecker = checker.for('ember-source');
@@ -100,41 +84,11 @@ module.exports = function (defaults) {
   app.import('node_modules/compare-versions/index.js');
   app.import('node_modules/normalize.css/normalize.css');
 
-  // Ember Debug
-
-  let emberDebug = 'ember_debug';
-
-  let sourceMap = new Funnel('node_modules/source-map-js', {
-    files: ['**/*.js'],
-    destDir: 'ember-debug/deps',
-  });
-
-  sourceMap = new Babel(sourceMap, {
-    plugins: ['transform-commonjs'],
-  });
-
-  const backburner = new Funnel('node_modules/backburner.js/dist/es6', {
-    files: ['backburner.js'],
-    destDir: 'ember-debug/deps',
-  });
+  let emberDebug = 'ember_debug/dist';
 
   emberDebug = new Funnel(emberDebug, {
     destDir: 'ember-debug',
     include: ['**/*.js'],
-    exclude: ['vendor/startup-wrapper.js', 'vendor/loader.js'],
-  });
-
-  emberDebug = mergeTrees([sourceMap, backburner, emberDebug]);
-
-  emberDebug = new Babel(emberDebug, {
-    moduleIds: true,
-    getModuleId: getRelativeModulePath,
-    plugins: [
-      ['@babel/plugin-transform-class-properties'],
-      ['@babel/plugin-transform-class-static-block'],
-      ['module-resolver', { resolvePath: resolveRelativeModulePath }],
-      ['@babel/plugin-transform-modules-amd', { noInterop: true }],
-    ],
   });
 
   const previousEmberVersionsSupportedString = `[${packageJson.previousEmberVersionsSupported

package/ember_debug/babel.config.cjs

@@ -0,0 +1,11 @@
+module.exports = {
+  plugins: [
+    ['@babel/plugin-proposal-decorators', { version: 'legacy' }],
+    ['@babel/plugin-transform-class-properties'],
+    ['@babel/plugin-transform-class-static-block'],
+  ],
+
+  generatorOpts: {
+    compact: false,
+  },
+};

package/ember_debug/libs/render-tree.js

@@ -1,36 +1,31 @@
 import captureRenderTree from './capture-render-tree';
 import { guidFor } from 'ember-debug/utils/ember/object/internals';
-import { EmberLoader, emberSafeRequire } from 'ember-debug/utils/ember/loader';
 import { inspect } from 'ember-debug/utils/type-check';
 import { isInVersionSpecifier } from 'ember-debug/utils/version';
-import { VERSION } from 'ember-debug/utils/ember';
+import {
+  VERSION,
+  EmberDestroyable,
+  GlimmerManager,
+  GlimmerReference,
+  GlimmerRuntime,
+  GlimmerUtil,
+} from 'ember-debug/utils/ember';
 
 class InElementSupportProvider {
   constructor(owner) {
     this.nodeMap = new Map();
     this.remoteRoots = [];
-    this.runtime = this.require('@glimmer/runtime');
-    this.reference = this.require('@glimmer/reference');
-    try {
-      this.Wormhole = requireModule('ember-wormhole/components/ember-wormhole');
-    } catch {
-      // nope
-    }
+    this.runtime = GlimmerRuntime;
+    this.reference = GlimmerReference;
 
-    try {
-      requireModule(
-        '@glimmer/manager',
-      ).CustomModifierManager.prototype.getDebugInstance = (args) =>
-        args.modifier || args.delegate;
-    } catch {
-      // nope
+    if (GlimmerManager) {
+      GlimmerManager.CustomModifierManager.prototype.getDebugInstance = (
+        args,
+      ) => args.modifier || args.delegate;
     }
 
-    this.DESTROY = emberSafeRequire('@glimmer/util')?.DESTROY;
-    this.registerDestructor =
-      emberSafeRequire('@glimmer/destroyable')?.registerDestructor ||
-      emberSafeRequire('@ember/destroyable')?.registerDestructor ||
-      emberSafeRequire('@ember/runtime')?.registerDestructor;
+    this.DESTROY = GlimmerUtil?.DESTROY;
+    this.registerDestructor = EmberDestroyable?.registerDestructor;
 
     this.debugRenderTree =
       owner.lookup('renderer:-dom')?.debugRenderTree ||
@@ -290,12 +285,6 @@ class InElementSupportProvider {
     );
     this.NewElementBuilderFunctions = null;
   }
-
-  require(req) {
-    return requireModule.has(req)
-      ? requireModule(req)
-      : EmberLoader.require(req);
-  }
 }
 
 export default class RenderTree {
@@ -613,9 +602,11 @@ export default class RenderTree {
         this.inElementSupport?.remoteRoots.push(node);
       }
 
+      // EmberWormhole component from ember-wormhole was used to provide
+      // rendering into a given DOM element prior to built-in in-element.
       if (
-        this.inElementSupport?.Wormhole &&
-        node.instance instanceof this.inElementSupport.Wormhole.default
+        node.template ===
+        'ember-wormhole/templates/components/ember-wormhole.hbs'
       ) {
         this.inElementSupport?.remoteRoots.push(node);
         const bounds = node.bounds;
@@ -643,10 +634,11 @@ export default class RenderTree {
           node.args.named[attr.nodeName] = attr.nodeValue;
         });
         // move modifiers and components into the element children
+
         parentNode.children.forEach((child) => {
           if (
-            child.bounds.parentElement === node.instance ||
-            child.meta?.parentElement === node.instance ||
+            node.instance.contains(child.bounds.parentElement) ||
+            node.instance.contains(child.meta?.parentElement) ||
             (child.type === 'modifier' &&
               child.bounds.firstNode === node.instance)
           ) {

package/ember_debug/libs/source-map.js

@@ -1,5 +1,5 @@
 import BaseObject from 'ember-debug/utils/base-object';
-import * as SourceMap from 'ember-debug/deps/source-map';
+import * as SourceMap from 'source-map-js';
 const notFoundError = new Error('Source map url not found');
 
 export default class extends BaseObject {

package/ember_debug/libs/view-inspection.js

@@ -317,7 +317,11 @@ export default class ViewInspection {
   onMouseMove(event) {
     event.preventDefault();
     event.stopPropagation();
-    this.inspectNearest(event.target, false);
+    let target = event.target;
+    if (target.shadowRoot) {
+      target = target.shadowRoot.elementFromPoint(event.x, event.y) || target;
+    }
+    this.inspectNearest(target, false);
   }
 
   onKeyDown(event) {
@@ -342,7 +346,11 @@ export default class ViewInspection {
     } else if (this.isInspecting && event.button === 0) {
       event.preventDefault();
       event.stopPropagation();
-      this.inspectNearest(event.target, true);
+      let target = event.target;
+      if (target.shadowRoot) {
+        target = target.shadowRoot.elementFromPoint(event.x, event.y) || target;
+      }
+      this.inspectNearest(target, true);
       this.stop(false);
     }
   }

package/ember_debug/object-inspector.js

@@ -16,28 +16,24 @@ import {
   ObjectProxy,
   ArrayProxy,
   Service,
+  InternalsMetal,
   Component,
+  GlimmerComponent,
+  GlimmerReference,
+  GlimmerValidator,
 } from 'ember-debug/utils/ember';
 import { cacheFor, guidFor } from 'ember-debug/utils/ember/object/internals';
 import { _backburner, join } from 'ember-debug/utils/ember/runloop';
 import emberNames from './utils/ember-object-names';
 import getObjectName from './utils/get-object-name';
-import { EmberLoader } from 'ember-debug/utils/ember/loader';
-
-const GlimmerComponent = (() => {
-  try {
-    return EmberLoader.require('@glimmer/component').default;
-  } catch {
-    // ignore, return undefined
-  }
-})();
 
 let tagValue, tagValidate, track, tagForProperty;
 
-try {
-  // Try to load the most recent library
-  let GlimmerValidator = EmberLoader.require('@glimmer/validator');
+const GlimmerDebugComponent = (() => GlimmerComponent?.default)();
 
+// Try to use the most recent library (GlimmerValidator), else
+// fallback on the previous implementation (GlimmerReference).
+if (GlimmerValidator) {
   tagValue = GlimmerValidator.value || GlimmerValidator.valueForTag;
   tagValidate = GlimmerValidator.validate || GlimmerValidator.validateTag;
   track = GlimmerValidator.track;
@@ -70,26 +66,15 @@ try {
     }
     return r;
   };
-} catch {
-  try {
-    // Fallback to the previous implementation
-    let GlimmerReference = EmberLoader.require('@glimmer/reference');
-
-    tagValue = GlimmerReference.value;
-    tagValidate = GlimmerReference.validate;
-  } catch {
-    // ignore
-  }
+} else if (GlimmerReference) {
+  tagValue = GlimmerReference.value;
+  tagValidate = GlimmerReference.validate;
 }
 
-try {
-  let metal = EmberLoader.require('@ember/-internals/metal');
-
-  tagForProperty = metal.tagForProperty;
+if (InternalsMetal) {
+  tagForProperty = InternalsMetal.tagForProperty;
   // If track was not already loaded, use metal's version (the previous version)
-  track = track || metal.track;
-} catch {
-  // ignore
+  track = track || InternalsMetal.track;
 }
 
 const HAS_GLIMMER_TRACKING = tagValue && tagValidate && track && tagForProperty;
@@ -914,18 +899,7 @@ function addProperties(properties, hash) {
     let options = { isMandatorySetter: isMandatorySetter(desc) };
 
     if (typeof hash[prop] === 'object' && hash[prop] !== null) {
-      options.isService =
-        !('type' in hash[prop]) && hash[prop].type === 'service';
-
-      if (!options.isService) {
-        if (hash[prop].constructor) {
-          options.isService = hash[prop].constructor.isServiceFactory;
-        }
-      }
-
-      if (!options.isService) {
-        options.isService = desc.value instanceof Service;
-      }
+      options.isService = desc.value instanceof Service;
     }
     if (options.isService) {
       replaceProperty(properties, prop, inspectValue(hash, prop), options);
@@ -1127,6 +1101,9 @@ function calculateCPs(
               item.code = '';
             }
           }
+          if (value instanceof Service) {
+            item.isService = true;
+          }
         }
       }
     });
@@ -1285,7 +1262,7 @@ function getDebugInfo(object) {
       'element',
       'targetObject',
     );
-  } else if (GlimmerComponent && object instanceof GlimmerComponent) {
+  } else if (GlimmerDebugComponent && object instanceof GlimmerDebugComponent) {
     // These properties don't really exist on Glimmer Components, but
     // reading their values trigger a development mode assertion. The
     // more correct long term fix is to make getters lazy (shows "..."

package/ember_debug/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "ember-debug",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "watch": "pnpm build --watch",
+    "build": "rollup --config",
+    "prepare": "pnpm build"
+  },
+  "devDependencies": {
+    "@babel/plugin-proposal-decorators": "^7.25.9",
+    "@babel/plugin-transform-class-properties": "^7.25.9",
+    "@babel/plugin-transform-class-static-block": "^7.26.0",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-node-resolve": "^16.0.1",
+    "backburner.js": "^2.8.0",
+    "glob": "^11.0.2",
+    "rollup": "^4.39.0",
+    "source-map-js": "^1.2.1"
+  },
+  "exports": {
+    "./*": "./*.js"
+  }
+}

package/ember_debug/rollup.config.js

@@ -0,0 +1,48 @@
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import { babel } from '@rollup/plugin-babel';
+import { globSync } from 'glob';
+
+export default {
+  input: [
+    'main.js',
+    ...globSync('adapters/**/*.js'),
+    'utils/version.js',
+    'port.js',
+    'utils/ember.js',
+    'models/profile-node.js',
+    'libs/promise-assembler.js',
+  ],
+  output: {
+    format: 'amd',
+    amd: {
+      autoId: true,
+      // id: 'ember-debug/[name]',
+      basePath: 'ember-debug',
+    },
+    chunkFileNames: '[name].js',
+    dir: 'dist',
+  },
+
+  plugins: [
+    babel(),
+    nodeResolve(),
+    commonjs(),
+    /**
+     * this plugin forces each of the intenral dependencies for each of the chunks to be prefixed with ember-debug
+     */
+    {
+      name: 'rollup-plugin-name-amd-modules',
+      renderChunk(code) {
+        let splitCode = code.split('\n');
+
+        splitCode[0] = splitCode[0].replaceAll(
+          /'\.\/([^']*)'/g,
+          `'ember-debug/$1'`,
+        );
+
+        return splitCode.join('\n');
+      },
+    },
+  ],
+};

package/ember_debug/utils/ember/debug.js

@@ -1,13 +1,12 @@
-import Ember from '../ember';
+import Ember, { Debug, InternalsUtils } from '../ember';
 
 let module;
-
 export let inspect;
 
-try {
-  module = requireModule('@ember/debug');
-  inspect = module.inspect || requireModule('@ember/-internals/utils').inspect;
-} catch {
+if (Debug) {
+  module = Debug;
+  inspect = Debug.inspect || InternalsUtils.inspect;
+} else {
   module = Ember.Debug;
   // eslint-disable-next-line ember/new-module-imports
   inspect = Ember.inspect;

package/ember_debug/utils/ember/instrumentation.js

@@ -1,10 +1,10 @@
-import Ember from '../ember';
+import Ember, { Instrumentation } from '../ember';
 
 let module;
 
-try {
-  module = requireModule('@ember/instrumentation');
-} catch {
+if (Instrumentation) {
+  module = Instrumentation;
+} else {
   module = Ember;
 }
 

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

@@ -1,14 +1,9 @@
-import Ember from '../../ember';
+import Ember, { ObjectInternals } from '../../ember';
 
-let module;
-
-try {
-  module = requireModule('@ember/object/internals');
-} catch {
-  module = Ember;
-}
-
-let { cacheFor, guidFor: emberGuidFor } = module;
+// eslint-disable-next-line ember/new-module-imports
+let cacheFor = ObjectInternals?.cacheFor ?? Ember.cacheFor;
+// eslint-disable-next-line ember/new-module-imports
+let emberGuidFor = ObjectInternals?.guidFor ?? Ember.guidFor;
 
 // it can happen that different ember apps/iframes have the same id for different objects
 // since the implementation is just a counter, so we add a prefix per iframe & app

package/ember_debug/utils/ember/own-runloop.js

@@ -1,4 +1,4 @@
-import Backburner from 'ember-debug/deps/backburner';
+import Backburner from 'backburner.js';
 
 let currentRunLoop = null;
 export function _getCurrentRunLoop() {

package/ember_debug/utils/ember/runloop.js

@@ -1,21 +1,21 @@
-import Ember from '../ember';
+import Ember, { Runloop as EmberRunloop } from '../ember';
 import * as runloop from './own-runloop';
 
+// it could happen that runloop is available but _backburner is not exported (dead code)
+// then we need to use our own.
 let module = runloop;
 let _backburner = runloop._backburner;
 
 const keys = ['cancel', 'debounce', 'join', 'later', 'scheduleOnce'];
 
-try {
-  module = requireModule('@ember/runloop');
-  // it could happen that runloop is available but _backburner is not exported (dead code)
-  // then we need to use our own
-  _backburner = module._backburner;
-} catch {
-  // eslint-disable-next-line ember/new-module-imports
-  _backburner = Ember?.run?.backburner || module._backburner;
+if (EmberRunloop) {
+  module = EmberRunloop;
+  _backburner = EmberRunloop._backburner || EmberRunloop.backburner;
+} else {
   // eslint-disable-next-line ember/new-module-imports
   module = Ember?.run || module;
+  // eslint-disable-next-line ember/new-module-imports
+  _backburner = Ember?.run?.backburner || _backburner;
 }
 
 if (!keys.every((k) => k in module)) {

package/ember_debug/utils/ember-object-names.js

@@ -1,5 +1,4 @@
 import { compareVersion } from 'ember-debug/utils/version';
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
 import {
   VERSION,
   ActionHandler,
@@ -10,6 +9,8 @@ import {
   MutableArray,
   Component,
   Evented,
+  InternalsRuntime,
+  InternalsViews,
   PromiseProxyMixin,
   EmberObject,
   Observable,
@@ -33,14 +34,12 @@ const emberNames = new Map([
 ]);
 
 if (compareVersion(VERSION, '3.27.0') === -1) {
-  const TargetActionSupport = emberSafeRequire(
-    '@ember/-internals/runtime',
-  )?.TargetActionSupport;
+  const TargetActionSupport = InternalsRuntime?.TargetActionSupport;
   emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin');
 }
 
 try {
-  const Views = emberSafeRequire('@ember/-internals/views') || {};
+  const Views = InternalsViews || {};
   emberNames.set(Views.ViewStateSupport, 'ViewStateSupport Mixin');
   emberNames.set(Views.ViewMixin, 'View Mixin');
   emberNames.set(Views.ActionSupport, 'ActionSupport Mixin');