Skip to content

Commit 7d48456

Browse files
patricklxpatricklx
committed
no glimmer component
1 parent ef36fbc commit 7d48456

File tree

5 files changed

+81
-37
lines changed

5 files changed

+81
-37
lines changed

‎package.json‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,46 @@
236236
"@ember/controller/index.js": "ember-source/@ember/controller/index.js",
237237
"@ember/debug/container-debug-adapter.js": "ember-source/@ember/debug/container-debug-adapter.js",
238238
"@ember/debug/data-adapter.js": "ember-source/@ember/debug/data-adapter.js",
239+
"@ember/debug/ember-inspector-support/adapters/basic.js": "ember-source/@ember/debug/ember-inspector-support/adapters/basic.js",
240+
"@ember/debug/ember-inspector-support/adapters/bookmarklet.js": "ember-source/@ember/debug/ember-inspector-support/adapters/bookmarklet.js",
241+
"@ember/debug/ember-inspector-support/adapters/chrome.js": "ember-source/@ember/debug/ember-inspector-support/adapters/chrome.js",
242+
"@ember/debug/ember-inspector-support/adapters/firefox.js": "ember-source/@ember/debug/ember-inspector-support/adapters/firefox.js",
243+
"@ember/debug/ember-inspector-support/adapters/index.js": "ember-source/@ember/debug/ember-inspector-support/adapters/index.js",
244+
"@ember/debug/ember-inspector-support/adapters/web-extension.js": "ember-source/@ember/debug/ember-inspector-support/adapters/web-extension.js",
245+
"@ember/debug/ember-inspector-support/adapters/websocket.js": "ember-source/@ember/debug/ember-inspector-support/adapters/websocket.js",
246+
"@ember/debug/ember-inspector-support/container-debug.js": "ember-source/@ember/debug/ember-inspector-support/container-debug.js",
247+
"@ember/debug/ember-inspector-support/data-debug.js": "ember-source/@ember/debug/ember-inspector-support/data-debug.js",
248+
"@ember/debug/ember-inspector-support/debug-port.js": "ember-source/@ember/debug/ember-inspector-support/debug-port.js",
249+
"@ember/debug/ember-inspector-support/deprecation-debug.js": "ember-source/@ember/debug/ember-inspector-support/deprecation-debug.js",
250+
"@ember/debug/ember-inspector-support/general-debug.js": "ember-source/@ember/debug/ember-inspector-support/general-debug.js",
251+
"@ember/debug/ember-inspector-support/index.js": "ember-source/@ember/debug/ember-inspector-support/index.js",
252+
"@ember/debug/ember-inspector-support/libs/capture-render-tree.js": "ember-source/@ember/debug/ember-inspector-support/libs/capture-render-tree.js",
253+
"@ember/debug/ember-inspector-support/libs/promise-assembler.js": "ember-source/@ember/debug/ember-inspector-support/libs/promise-assembler.js",
254+
"@ember/debug/ember-inspector-support/libs/render-tree.js": "ember-source/@ember/debug/ember-inspector-support/libs/render-tree.js",
255+
"@ember/debug/ember-inspector-support/libs/source-map.js": "ember-source/@ember/debug/ember-inspector-support/libs/source-map.js",
256+
"@ember/debug/ember-inspector-support/libs/view-inspection.js": "ember-source/@ember/debug/ember-inspector-support/libs/view-inspection.js",
257+
"@ember/debug/ember-inspector-support/main.js": "ember-source/@ember/debug/ember-inspector-support/main.js",
258+
"@ember/debug/ember-inspector-support/models/profile-manager.js": "ember-source/@ember/debug/ember-inspector-support/models/profile-manager.js",
259+
"@ember/debug/ember-inspector-support/models/profile-node.js": "ember-source/@ember/debug/ember-inspector-support/models/profile-node.js",
260+
"@ember/debug/ember-inspector-support/models/promise.js": "ember-source/@ember/debug/ember-inspector-support/models/promise.js",
261+
"@ember/debug/ember-inspector-support/object-inspector.js": "ember-source/@ember/debug/ember-inspector-support/object-inspector.js",
262+
"@ember/debug/ember-inspector-support/port.js": "ember-source/@ember/debug/ember-inspector-support/port.js",
263+
"@ember/debug/ember-inspector-support/promise-debug.js": "ember-source/@ember/debug/ember-inspector-support/promise-debug.js",
264+
"@ember/debug/ember-inspector-support/render-debug.js": "ember-source/@ember/debug/ember-inspector-support/render-debug.js",
265+
"@ember/debug/ember-inspector-support/route-debug.js": "ember-source/@ember/debug/ember-inspector-support/route-debug.js",
266+
"@ember/debug/ember-inspector-support/services/session.js": "ember-source/@ember/debug/ember-inspector-support/services/session.js",
267+
"@ember/debug/ember-inspector-support/utils/base-object.js": "ember-source/@ember/debug/ember-inspector-support/utils/base-object.js",
268+
"@ember/debug/ember-inspector-support/utils/bound-method.js": "ember-source/@ember/debug/ember-inspector-support/utils/bound-method.js",
269+
"@ember/debug/ember-inspector-support/utils/classify.js": "ember-source/@ember/debug/ember-inspector-support/utils/classify.js",
270+
"@ember/debug/ember-inspector-support/utils/dasherize.js": "ember-source/@ember/debug/ember-inspector-support/utils/dasherize.js",
271+
"@ember/debug/ember-inspector-support/utils/ember-object-names.js": "ember-source/@ember/debug/ember-inspector-support/utils/ember-object-names.js",
272+
"@ember/debug/ember-inspector-support/utils/ember/object/internals.js": "ember-source/@ember/debug/ember-inspector-support/utils/ember/object/internals.js",
273+
"@ember/debug/ember-inspector-support/utils/evented.js": "ember-source/@ember/debug/ember-inspector-support/utils/evented.js",
274+
"@ember/debug/ember-inspector-support/utils/get-object-name.js": "ember-source/@ember/debug/ember-inspector-support/utils/get-object-name.js",
275+
"@ember/debug/ember-inspector-support/utils/name-functions.js": "ember-source/@ember/debug/ember-inspector-support/utils/name-functions.js",
276+
"@ember/debug/ember-inspector-support/utils/on-ready.js": "ember-source/@ember/debug/ember-inspector-support/utils/on-ready.js",
277+
"@ember/debug/ember-inspector-support/utils/type-check.js": "ember-source/@ember/debug/ember-inspector-support/utils/type-check.js",
278+
"@ember/debug/ember-inspector-support/view-debug.js": "ember-source/@ember/debug/ember-inspector-support/view-debug.js",
239279
"@ember/debug/index.js": "ember-source/@ember/debug/index.js",
240280
"@ember/debug/lib/assert.js": "ember-source/@ember/debug/lib/assert.js",
241281
"@ember/debug/lib/capture-render-tree.js": "ember-source/@ember/debug/lib/capture-render-tree.js",
@@ -356,7 +396,8 @@
356396
"ember/version.js": "ember-source/ember/version.js",
357397
"route-recognizer/index.js": "ember-source/route-recognizer/index.js",
358398
"router_js/index.js": "ember-source/router_js/index.js",
359-
"rsvp/index.js": "ember-source/rsvp/index.js"
399+
"rsvp/index.js": "ember-source/rsvp/index.js",
400+
"source-map-js/index.js": "ember-source/source-map-js/index.js"
360401
}
361402
},
362403
"typesVersions": {
@@ -373,4 +414,4 @@
373414
"node": "16.20.0",
374415
"pnpm": "8.10.0"
375416
}
376-
}
417+
}

‎packages/@ember/debug/ember-inspector-support/data-debug.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export default class DataDebug extends DebugPort {
3434
return owner.resolveRegistration(name);
3535
}
3636

37-
3837
get objectInspector() {
3938
return this.namespace?.objectInspector;
4039
}

‎packages/@ember/debug/ember-inspector-support/deprecation-debug.ts‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@ import SourceMap from '@ember/debug/ember-inspector-support/libs/source-map';
44
import { registerDeprecationHandler } from '@ember/debug';
55
import { guidFor } from '@ember/debug/ember-inspector-support/utils/ember/object/internals';
66
import { cancel, debounce } from '@ember/runloop';
7-
import SourceMapSupport from '@ember/debug/ember-inspector-support/libs/source-map';
7+
import type SourceMapSupport from '@ember/debug/ember-inspector-support/libs/source-map';
88

99
export default class DeprecationDebug extends DebugPort {
1010
options: any;
1111
private _warned!: boolean;
1212
debounce: any;
1313
private _watching: any;
14-
deprecationsToSend: { stackStr: string, message: string, url: string, count: number, id: string, sources: any[] }[];
14+
deprecationsToSend: {
15+
stackStr: string;
16+
message: string;
17+
url: string;
18+
count: number;
19+
id: string;
20+
sources: any[];
21+
}[];
1522
private sourceMap!: SourceMapSupport;
1623
groupedDeprecations: any;
1724
deprecations: any;
@@ -36,7 +43,10 @@ export default class DeprecationDebug extends DebugPort {
3643
this.sendPending();
3744
},
3845

39-
sendStackTraces(this: DeprecationDebug, message: { deprecation: { message: string; sources: { stackStr: string }[] } }) {
46+
sendStackTraces(
47+
this: DeprecationDebug,
48+
message: { deprecation: { message: string; sources: { stackStr: string }[] } }
49+
) {
4050
let deprecation = message.deprecation;
4151
deprecation.sources.forEach((source) => {
4252
let stack = source.stackStr;
@@ -97,26 +107,23 @@ export default class DeprecationDebug extends DebugPort {
97107
*/
98108
fetchSourceMap(stackStr: string) {
99109
if (this.emberCliConfig && this.emberCliConfig.environment === 'development') {
100-
return this.sourceMap.map(stackStr).then(
101-
(mapped: any[]) => {
102-
if (mapped && mapped.length > 0) {
103-
let source = mapped.find(
104-
(item: any) =>
105-
item.source &&
106-
Boolean(item.source.match(new RegExp(this.emberCliConfig.modulePrefix)))
107-
);
108-
109-
if (source) {
110-
source.found = true;
111-
} else {
112-
source = mapped[0];
113-
source.found = false;
114-
}
115-
return source;
110+
return this.sourceMap.map(stackStr).then((mapped: any[]) => {
111+
if (mapped && mapped.length > 0) {
112+
let source = mapped.find(
113+
(item: any) =>
114+
item.source &&
115+
Boolean(item.source.match(new RegExp(this.emberCliConfig.modulePrefix)))
116+
);
117+
118+
if (source) {
119+
source.found = true;
120+
} else {
121+
source = mapped[0];
122+
source.found = false;
116123
}
117-
},
118-
null
119-
);
124+
return source;
125+
}
126+
}, null);
120127
} else {
121128
return Promise.resolve(null);
122129
}
@@ -150,16 +157,13 @@ export default class DeprecationDebug extends DebugPort {
150157
let found = obj.sources.find((s: any) => s.stackStr === deprecation.stackStr);
151158
if (!found) {
152159
let stackStr = deprecation.stackStr;
153-
promise = this.fetchSourceMap(stackStr).then(
154-
(map) => {
155-
obj.sources.push({ map, stackStr });
156-
if (map) {
157-
obj.hasSourceMap = true;
158-
}
159-
return undefined;
160-
},
161-
null
162-
);
160+
promise = this.fetchSourceMap(stackStr).then((map) => {
161+
obj.sources.push({ map, stackStr });
162+
if (map) {
163+
obj.hasSourceMap = true;
164+
}
165+
return undefined;
166+
}, null);
163167
}
164168
return promise.then(() => {
165169
delete obj.stackStr;

‎packages/@ember/debug/ember-inspector-support/object-inspector.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import type Mixin from '@ember/object/mixin';
2222
import ObjectProxy from '@ember/object/proxy';
2323
import ArrayProxy from '@ember/array/proxy';
2424
import Component from '@ember/component';
25-
import GlimmerComponent from '@glimmer/component';
2625

2726
const keys = Object.keys;
2827

@@ -1228,7 +1227,7 @@ function getDebugInfo(object: any) {
12281227
'element',
12291228
'targetObject'
12301229
);
1231-
} else if (GlimmerComponent && object instanceof GlimmerComponent) {
1230+
} else if (object.constructor.name === 'GlimmerDebugComponent') {
12321231
// These properties don't really exist on Glimmer Components, but
12331232
// reading their values trigger a development mode assertion. The
12341233
// more correct long term fix is to make getters lazy (shows "..."

‎rollup.config.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ function rolledUpPackages() {
183183
export function exposedDependencies() {
184184
return {
185185
'backburner.js': require.resolve('backburner.js/dist/es6/backburner.js'),
186+
'source-map-js': require.resolve('source-map-js'),
186187
rsvp: require.resolve('rsvp/lib/rsvp.js'),
187188
'dag-map': require.resolve('dag-map/dag-map.js'),
188189
router_js: require.resolve('router_js/dist/modules/index.js'),

0 commit comments

Comments
 (0)