From bb7a8279a7bcac3b431bd99c2a7acc2ec90f16d3 Mon Sep 17 00:00:00 2001 From: Florian Pichler Date: Mon, 1 Jun 2026 14:11:14 +0200 Subject: [PATCH 1/8] Further cleanup ember-debug package - move sources into src - prepare rollup config for changes --- .../entrypoints/{basic-debug.js => basic.js} | 0 .../{bookmarklet-debug.js => bookmarklet.js} | 0 .../{chrome-debug.js => chrome.js} | 0 .../{firefox-debug.js => firefox.js} | 0 .../{websocket-debug.js => websocket.js} | 0 packages/ember-debug/index.js | 0 packages/ember-debug/lib/start-inspector.js | 2 +- packages/ember-debug/rollup.config.js | 37 +++++++++++++------ .../ember-debug/{ => src}/container-debug.js | 0 packages/ember-debug/{ => src}/data-debug.js | 2 +- packages/ember-debug/{ => src}/debug-port.js | 2 +- .../{ => src}/deprecation-debug.js | 8 ++-- .../ember-debug/{ => src}/general-debug.js | 2 +- packages/ember-debug/{ => src}/main.js | 17 +++++---- .../ember-debug/{ => src}/object-inspector.js | 16 ++++---- packages/ember-debug/{ => src}/port.js | 8 ++-- .../ember-debug/{ => src}/promise-debug.js | 6 +-- .../ember-debug/{ => src}/render-debug.js | 8 ++-- packages/ember-debug/{ => src}/route-debug.js | 12 +++--- packages/ember-debug/{ => src}/view-debug.js | 6 +-- 20 files changed, 71 insertions(+), 55 deletions(-) rename packages/ember-debug/entrypoints/{basic-debug.js => basic.js} (100%) rename packages/ember-debug/entrypoints/{bookmarklet-debug.js => bookmarklet.js} (100%) rename packages/ember-debug/entrypoints/{chrome-debug.js => chrome.js} (100%) rename packages/ember-debug/entrypoints/{firefox-debug.js => firefox.js} (100%) rename packages/ember-debug/entrypoints/{websocket-debug.js => websocket.js} (100%) delete mode 100644 packages/ember-debug/index.js rename packages/ember-debug/{ => src}/container-debug.js (100%) rename packages/ember-debug/{ => src}/data-debug.js (98%) rename packages/ember-debug/{ => src}/debug-port.js (95%) rename packages/ember-debug/{ => src}/deprecation-debug.js (96%) rename packages/ember-debug/{ => src}/general-debug.js (98%) rename packages/ember-debug/{ => src}/main.js (91%) rename packages/ember-debug/{ => src}/object-inspector.js (98%) rename packages/ember-debug/{ => src}/port.js (93%) rename packages/ember-debug/{ => src}/promise-debug.js (97%) rename packages/ember-debug/{ => src}/render-debug.js (92%) rename packages/ember-debug/{ => src}/route-debug.js (96%) rename packages/ember-debug/{ => src}/view-debug.js (96%) diff --git a/packages/ember-debug/entrypoints/basic-debug.js b/packages/ember-debug/entrypoints/basic.js similarity index 100% rename from packages/ember-debug/entrypoints/basic-debug.js rename to packages/ember-debug/entrypoints/basic.js diff --git a/packages/ember-debug/entrypoints/bookmarklet-debug.js b/packages/ember-debug/entrypoints/bookmarklet.js similarity index 100% rename from packages/ember-debug/entrypoints/bookmarklet-debug.js rename to packages/ember-debug/entrypoints/bookmarklet.js diff --git a/packages/ember-debug/entrypoints/chrome-debug.js b/packages/ember-debug/entrypoints/chrome.js similarity index 100% rename from packages/ember-debug/entrypoints/chrome-debug.js rename to packages/ember-debug/entrypoints/chrome.js diff --git a/packages/ember-debug/entrypoints/firefox-debug.js b/packages/ember-debug/entrypoints/firefox.js similarity index 100% rename from packages/ember-debug/entrypoints/firefox-debug.js rename to packages/ember-debug/entrypoints/firefox.js diff --git a/packages/ember-debug/entrypoints/websocket-debug.js b/packages/ember-debug/entrypoints/websocket.js similarity index 100% rename from packages/ember-debug/entrypoints/websocket-debug.js rename to packages/ember-debug/entrypoints/websocket.js diff --git a/packages/ember-debug/index.js b/packages/ember-debug/index.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ember-debug/lib/start-inspector.js b/packages/ember-debug/lib/start-inspector.js index ee88e6eac8..8063b5ac7e 100644 --- a/packages/ember-debug/lib/start-inspector.js +++ b/packages/ember-debug/lib/start-inspector.js @@ -8,7 +8,7 @@ import { import bootEmberInspector from './boot-ember-inspector.js'; import setupInstanceInitializer from './setup-instance-initializer.js'; import sendVersionMiss from './send-version-miss.js'; -import getEmberDebug from '../main.js'; +import getEmberDebug from '../src/main.js'; import { guidFor, Application, VERSION } from './ember.js'; import { onEmberReady } from '../utils/on-ready.js'; diff --git a/packages/ember-debug/rollup.config.js b/packages/ember-debug/rollup.config.js index 6b94c1b30f..b7d93ecbc8 100644 --- a/packages/ember-debug/rollup.config.js +++ b/packages/ember-debug/rollup.config.js @@ -3,22 +3,35 @@ import commonjs from '@rollup/plugin-commonjs'; import { babel } from '@rollup/plugin-babel'; import { globSync } from 'glob'; import del from 'rollup-plugin-delete'; +import { basename, extname } from 'path'; export default { - input: [ - 'lib/ember.js', - 'lib/promise-assembler.js', - 'lib/type-check.js', - 'main.js', - 'models/profile-node.js', - 'port.js', - 'utils/version.js', - 'utils/versions.js', - ...globSync('entrypoints/*.js'), - ], + input: Object.fromEntries([ + ...[ + 'lib/ember.js', + 'lib/promise-assembler.js', + 'lib/type-check.js', + 'models/profile-node.js', + 'src/main.js', + 'src/port.js', + 'utils/version.js', + 'utils/versions.js', + ].map((f) => [basename(f, extname(f)), f]), + ...globSync('entrypoints/*.js').map((f) => [ + `${basename(f, extname(f))}-debug`, + f, + ]), + ]), output: { dir: 'dist', }, - plugins: [babel(), nodeResolve(), commonjs(), del({ targets: 'dist' })], + plugins: [ + babel({ + babelHelpers: 'bundled', + }), + nodeResolve(), + commonjs(), + del({ targets: 'dist' }), + ], }; diff --git a/packages/ember-debug/container-debug.js b/packages/ember-debug/src/container-debug.js similarity index 100% rename from packages/ember-debug/container-debug.js rename to packages/ember-debug/src/container-debug.js diff --git a/packages/ember-debug/data-debug.js b/packages/ember-debug/src/data-debug.js similarity index 98% rename from packages/ember-debug/data-debug.js rename to packages/ember-debug/src/data-debug.js index c7a1189894..e18f7cc25c 100644 --- a/packages/ember-debug/data-debug.js +++ b/packages/ember-debug/src/data-debug.js @@ -1,5 +1,5 @@ import DebugPort from './debug-port.js'; -import { guidFor } from './lib/ember/object/internals.js'; +import { guidFor } from '../lib/ember/object/internals.js'; export default class extends DebugPort { // eslint-disable-next-line ember/classic-decorator-hooks diff --git a/packages/ember-debug/debug-port.js b/packages/ember-debug/src/debug-port.js similarity index 95% rename from packages/ember-debug/debug-port.js rename to packages/ember-debug/src/debug-port.js index 4ce5410bd8..a014334c54 100644 --- a/packages/ember-debug/debug-port.js +++ b/packages/ember-debug/src/debug-port.js @@ -1,4 +1,4 @@ -import BaseObject from './utils/base-object.js'; +import BaseObject from '../utils/base-object.js'; export default class extends BaseObject { port = null; diff --git a/packages/ember-debug/deprecation-debug.js b/packages/ember-debug/src/deprecation-debug.js similarity index 96% rename from packages/ember-debug/deprecation-debug.js rename to packages/ember-debug/src/deprecation-debug.js index 5fc0bbd7e8..1e7e8e5445 100644 --- a/packages/ember-debug/deprecation-debug.js +++ b/packages/ember-debug/src/deprecation-debug.js @@ -1,9 +1,9 @@ import DebugPort from './debug-port.js'; -import SourceMap from './lib/source-map.js'; +import SourceMap from '../lib/source-map.js'; -import { Debug } from './lib/ember.js'; -import { guidFor } from './lib/ember/object/internals.js'; -import { cancel, debounce } from './lib/ember/runloop.js'; +import { Debug } from '../lib/ember.js'; +import { guidFor } from '../lib/ember/object/internals.js'; +import { cancel, debounce } from '../lib/ember/runloop.js'; export default class extends DebugPort { static { diff --git a/packages/ember-debug/general-debug.js b/packages/ember-debug/src/general-debug.js similarity index 98% rename from packages/ember-debug/general-debug.js rename to packages/ember-debug/src/general-debug.js index 6e94bd483d..e3e51a9a57 100644 --- a/packages/ember-debug/general-debug.js +++ b/packages/ember-debug/src/general-debug.js @@ -1,7 +1,7 @@ /* eslint no-empty:0 */ import DebugPort from './debug-port.js'; -import { libraries } from './lib/ember.js'; +import { libraries } from '../lib/ember.js'; /** * Class that handles gathering general information of the inspected app. diff --git a/packages/ember-debug/main.js b/packages/ember-debug/src/main.js similarity index 91% rename from packages/ember-debug/main.js rename to packages/ember-debug/src/main.js index fc6553f8df..0ae3990138 100644 --- a/packages/ember-debug/main.js +++ b/packages/ember-debug/src/main.js @@ -1,4 +1,4 @@ -import BasicAdapter from './adapters/basic.js'; +import BasicAdapter from '../adapters/basic.js'; import Port from './port.js'; import ObjectInspector from './object-inspector.js'; import GeneralDebug from './general-debug.js'; @@ -9,12 +9,15 @@ import DataDebug from './data-debug.js'; import PromiseDebug from './promise-debug.js'; import ContainerDebug from './container-debug.js'; import DeprecationDebug from './deprecation-debug.js'; -import Session from './services/session.js'; - -import { getApplications, getApplicationInstance } from './lib/applications.js'; -import { guidFor, setGuidPrefix } from './lib/ember/object/internals.js'; -import { run } from './lib/ember/runloop.js'; -import BaseObject from './utils/base-object.js'; +import Session from '../services/session.js'; + +import { + getApplications, + getApplicationInstance, +} from '../lib/applications.js'; +import { guidFor, setGuidPrefix } from '../lib/ember/object/internals.js'; +import { run } from '../lib/ember/runloop.js'; +import BaseObject from '../utils/base-object.js'; export class EmberDebug extends BaseObject { /** diff --git a/packages/ember-debug/object-inspector.js b/packages/ember-debug/src/object-inspector.js similarity index 98% rename from packages/ember-debug/object-inspector.js rename to packages/ember-debug/src/object-inspector.js index c4ae7c96e8..747acc0911 100644 --- a/packages/ember-debug/object-inspector.js +++ b/packages/ember-debug/src/object-inspector.js @@ -1,13 +1,13 @@ /* eslint-disable ember/no-private-routing-service */ import DebugPort from './debug-port.js'; -import bound from './utils/bound-method.js'; +import bound from '../utils/bound-method.js'; import { isComputed, getDescriptorFor, typeOf, inspect, -} from './lib/type-check.js'; -import { compareVersion } from './utils/version.js'; +} from '../lib/type-check.js'; +import { compareVersion } from '../utils/version.js'; import { EmberObject, meta as emberMeta, @@ -22,11 +22,11 @@ import { GlimmerReference, GlimmerValidator, getOwner, -} from './lib/ember.js'; -import { cacheFor, guidFor } from './lib/ember/object/internals.js'; -import { _backburner, join } from './lib/ember/runloop.js'; -import emberNames from './lib/ember-object-names.js'; -import getObjectName from './lib/get-object-name.js'; +} from '../lib/ember.js'; +import { cacheFor, guidFor } from '../lib/ember/object/internals.js'; +import { _backburner, join } from '../lib/ember/runloop.js'; +import emberNames from '../lib/ember-object-names.js'; +import getObjectName from '../lib/get-object-name.js'; let tagValue, tagValidate, track, tagForProperty; diff --git a/packages/ember-debug/port.js b/packages/ember-debug/src/port.js similarity index 93% rename from packages/ember-debug/port.js rename to packages/ember-debug/src/port.js index 3153086cb8..6858d36aff 100644 --- a/packages/ember-debug/port.js +++ b/packages/ember-debug/src/port.js @@ -1,7 +1,7 @@ -import { guidFor } from './lib/ember/object/internals.js'; -import { run } from './lib/ember/runloop.js'; -import BaseObject from './utils/base-object.js'; -import Evented from './utils/evented.js'; +import { guidFor } from '../lib/ember/object/internals.js'; +import { run } from '../lib/ember/runloop.js'; +import BaseObject from '../utils/base-object.js'; +import Evented from '../utils/evented.js'; export default class extends BaseObject { constructor(data) { diff --git a/packages/ember-debug/promise-debug.js b/packages/ember-debug/src/promise-debug.js similarity index 97% rename from packages/ember-debug/promise-debug.js rename to packages/ember-debug/src/promise-debug.js index 51a59dc66c..38de531b56 100644 --- a/packages/ember-debug/promise-debug.js +++ b/packages/ember-debug/src/promise-debug.js @@ -1,7 +1,7 @@ import DebugPort from './debug-port.js'; -import PromiseAssembler from './lib/promise-assembler.js'; -import { debounce } from './lib/ember/runloop.js'; -import { RSVP } from './lib/ember.js'; +import PromiseAssembler from '../lib/promise-assembler.js'; +import { debounce } from '../lib/ember/runloop.js'; +import { RSVP } from '../lib/ember.js'; export default class extends DebugPort { get objectInspector() { diff --git a/packages/ember-debug/render-debug.js b/packages/ember-debug/src/render-debug.js similarity index 92% rename from packages/ember-debug/render-debug.js rename to packages/ember-debug/src/render-debug.js index 9e6927e646..c031cae51f 100644 --- a/packages/ember-debug/render-debug.js +++ b/packages/ember-debug/src/render-debug.js @@ -1,9 +1,9 @@ import DebugPort from './debug-port.js'; -import ProfileManager from './models/profile-manager.js'; +import ProfileManager from '../models/profile-manager.js'; -import { subscribe } from './lib/ember.js'; -import { _backburner } from './lib/ember/runloop.js'; -import bound from './utils/bound-method.js'; +import { subscribe } from '../lib/ember.js'; +import { _backburner } from '../lib/ember/runloop.js'; +import bound from '../utils/bound-method.js'; // Initial setup, that has to occur before the EmberObject init for some reason let profileManager = new ProfileManager(); diff --git a/packages/ember-debug/route-debug.js b/packages/ember-debug/src/route-debug.js similarity index 96% rename from packages/ember-debug/route-debug.js rename to packages/ember-debug/src/route-debug.js index f298c431d8..c537706b88 100644 --- a/packages/ember-debug/route-debug.js +++ b/packages/ember-debug/src/route-debug.js @@ -1,11 +1,11 @@ /* eslint-disable ember/no-private-routing-service */ import DebugPort from './debug-port.js'; -import { compareVersion } from './utils/version.js'; -import { VERSION } from './lib/ember.js'; -import classify from './utils/classify.js'; -import dasherize from './utils/dasherize.js'; -import { _backburner, later } from './lib/ember/runloop.js'; -import bound from './utils/bound-method.js'; +import { compareVersion } from '../utils/version.js'; +import { VERSION } from '../lib/ember.js'; +import classify from '../utils/classify.js'; +import dasherize from '../utils/dasherize.js'; +import { _backburner, later } from '../lib/ember/runloop.js'; +import bound from '../utils/bound-method.js'; const { hasOwnProperty } = Object.prototype; diff --git a/packages/ember-debug/view-debug.js b/packages/ember-debug/src/view-debug.js similarity index 96% rename from packages/ember-debug/view-debug.js rename to packages/ember-debug/src/view-debug.js index 566076c55a..6878768457 100644 --- a/packages/ember-debug/view-debug.js +++ b/packages/ember-debug/src/view-debug.js @@ -1,8 +1,8 @@ /* eslint no-cond-assign:0 */ import DebugPort from './debug-port.js'; -import RenderTree from './lib/render-tree.js'; -import ViewInspection from './lib/view-inspection.js'; -import bound from './utils/bound-method.js'; +import RenderTree from '../lib/render-tree.js'; +import ViewInspection from '../lib/view-inspection.js'; +import bound from '../utils/bound-method.js'; export default class extends DebugPort { get adapter() { From cf57b081652b16d71c7c4a39c8b713e63321e6be Mon Sep 17 00:00:00 2001 From: Florian Pichler Date: Mon, 1 Jun 2026 15:19:13 +0200 Subject: [PATCH 2/8] Bugfix: handleRedirect must preventDefault when attached to an anchor --- .../ember-inspector/app/components/deprecation-item-source.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ember-inspector/app/components/deprecation-item-source.js b/packages/ember-inspector/app/components/deprecation-item-source.js index 91f7c28562..6ccb51d666 100644 --- a/packages/ember-inspector/app/components/deprecation-item-source.js +++ b/packages/ember-inspector/app/components/deprecation-item-source.js @@ -32,7 +32,9 @@ export default class DeprecationItemSource extends Component { } @action - handleRedirect() { + handleRedirect(event) { + // FIXME: this should be attached to a