fix ember 6

Author: patricklx

ember_debug/object-inspector.js

@@ -39,33 +39,37 @@ if (GlimmerValidator) {
   track = GlimmerValidator.track;
 
   // patch tagFor to add debug info, older versions already have _propertyKey
-  const tagFor = GlimmerValidator.tagFor;
-  GlimmerValidator.tagFor = function (...args) {
-    const tag = tagFor.call(this, ...args);
-    const [obj, key] = args;
-    if (
-      (!tag._propertyKey || !tag._object) &&
-      typeof obj === 'object' &&
-      typeof key === 'string'
-    ) {
-      tag._propertyKey = key;
-      tag._object = obj;
-    }
-    return tag;
-  };
-  const trackedData = GlimmerValidator.trackedData;
-  GlimmerValidator.trackedData = function (...args) {
-    const r = trackedData.call(this, ...args);
-    if (r.getter && args.length === 2) {
-      const [key] = args;
-      const getter = r.getter;
-      r.getter = function (self) {
-        GlimmerValidator.tagFor(self, key);
-        return getter.call(this, self);
-      };
-    }
-    return r;
-  };
+  try {
+    const tagFor = GlimmerValidator.tagFor;
+    GlimmerValidator.tagFor = function (...args) {
+      const tag = tagFor.call(this, ...args);
+      const [obj, key] = args;
+      if (
+        (!tag._propertyKey || !tag._object) &&
+        typeof obj === 'object' &&
+        typeof key === 'string'
+      ) {
+        tag._propertyKey = key;
+        tag._object = obj;
+      }
+      return tag;
+    };
+    const trackedData = GlimmerValidator.trackedData;
+    GlimmerValidator.trackedData = function (...args) {
+      const r = trackedData.call(this, ...args);
+      if (r.getter && args.length === 2) {
+        const [key] = args;
+        const getter = r.getter;
+        r.getter = function (self) {
+          GlimmerValidator.tagFor(self, key);
+          return getter.call(this, self);
+        };
+      }
+      return r;
+    };
+  } catch {
+    // cannot patch
+  }
 } else if (GlimmerReference) {
   tagValue = GlimmerReference.value;
   tagValidate = GlimmerReference.validate;

test-apps/embroider-static-source/app/app.js

@@ -1,3 +1,4 @@
+import './inspector-support';
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';

test-apps/embroider-static-source/app/inspector-support.js

@@ -0,0 +1,26 @@
+// this is to support ember > 6
+
+import Ember from 'ember';
+import * as runtime from '@glimmer/runtime';
+import * as tracking from '@glimmer/tracking';
+import * as validator from '@glimmer/validator';
+import { RSVP } from '@ember/-internals/runtime';
+import * as metal from '@ember/-internals/metal';
+import * as runloop from '@ember/runloop';
+
+import config from 'test-app/config/environment';
+
+// eslint-disable-next-line ember/new-module-imports
+if (Ember.VERSION?.startsWith('6')) {
+  window.define('@glimmer/tracking', () => tracking);
+  window.define('@glimmer/runtime', () => runtime);
+  window.define('@ember/-internals/metal', () => metal);
+  window.define('@glimmer/validator', () => validator);
+  window.define('@ember/runloop', () => runloop);
+  window.define('rsvp', () => RSVP);
+  window.define('ember', () => ({ default: Ember }));
+  window.define('test-app/config/environment', () => ({
+    default: config,
+  }));
+  document.dispatchEvent(new Event('Ember'));
+}

test-apps/tests/index.html

@@ -52,11 +52,11 @@
       document.head.appendChild(meta);
     </script>
 
+    <script src="{{rootURL}}ember_debug.js"></script>
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/test-app.js"></script>
-    <script src="{{rootURL}}ember_debug.js"></script>
     <script src="{{rootURL}}assets/tests.js"></script>
 
     {{content-for "body-footer"}}

test-apps/tests/test-helper.js

@@ -7,9 +7,6 @@ import { start } from 'ember-qunit';
 import TestAdapter from './test-adapter';
 import setupSinon from 'ember-sinon-qunit';
 
-// ensure ember-debug is required
-import 'ember-debug/main';
-
 Application.initializer({
   name: `00-override-adapter`,
   initialize(app) {
@@ -26,4 +23,10 @@ QUnit.config.testTimeout = 60000;
 
 setup(QUnit.assert);
 
-start();
+export async function waitForEmberDebug() {
+  while (true) {
+    if (requireModule.has('ember-debug/main')) return;
+    await new Promise((res) => setTimeout(res, 1));
+  }
+}
+waitForEmberDebug().then(() => start());