ember-vite-hmr 2.4.0 → 2.7.1

package/dist/instance-initializers/setup-hmr-manager.js

@@ -3,6 +3,13 @@ import Service from '@ember/service';
 import Component from '@glimmer/component';
 import { getInternalComponentManager } from '@glimmer/manager';
 
+// Accessor for the HMR runtime helpers exposed on the global by
+// virtual:ember-vite-hmr-runtime. Only set in dev/serve mode (guarded by
+// `if (!import.meta.hot)` at the call site).
+
+function hmrRuntime() {
+  return globalThis.__ember_vite_hmr;
+}
 function findPropertyDescriptor(component, key) {
   let proto = component;
   while (proto) {
@@ -80,24 +87,18 @@ function getState(component, skip) {
   }
   return state;
 }
-function syncState(instance) {
-  const args = instance.args;
-  if (args.__hot__) {
-    const oldInstance = args.__hot__.oldInstance;
-    const state = instance.__get_hot_state__?.() || args.__hot__.getState?.();
-    for (const k in state) {
-      if (instance[k] instanceof Service) {
-        continue;
-      }
-      instance[k] = state[k];
-    }
 
-    // Call _hmrAccepted hook if defined
-    if (typeof instance._hmrAccepted === 'function') {
-      instance._hmrAccepted(oldInstance);
+// Apply a stashed old-instance state to a freshly created new instance.
+// Also calls the _hmrAccepted lifecycle hook if defined on the new instance.
+function applySyncState(instance, state, oldInstance) {
+  for (const k in state) {
+    if (instance[k] instanceof Service) {
+      continue;
     }
-    args.__hot__.getState = () => getState(instance, ['args']);
-    args.__hot__.oldInstance = instance;
+    instance[k] = state[k];
+  }
+  if (typeof instance._hmrAccepted === 'function') {
+    instance._hmrAccepted(oldInstance);
   }
 }
 function initialize() {
@@ -108,9 +109,53 @@ function initialize() {
   const proto = Object.getPrototypeOf(ComponentManager);
   const create = proto.create;
   proto.create = function (...args) {
-    const instance = create.call(this, ...args);
-    setTimeout(() => syncState(instance.component));
-    return instance;
+    const bucket = create.call(this, ...args);
+    const component = bucket.component;
+
+    // Enqueue this instance in the runtime's per-class FIFO queue. The runtime
+    // only enqueues when isHmrClass(klass) is true (registered HMR class), and
+    // clears the queue at update() time so user-flow stale entries are never
+    // present when willDestroy fires during an HMR swap.
+    const klass = component.constructor;
+    const rt = hmrRuntime();
+    if (rt?.isHmrClass(klass)) {
+      rt.enqueueInstance(klass, component);
+    }
+    return bucket;
+  };
+
+  // Patch willDestroy on the Component prototype to detect HMR swaps and
+  // transfer state from the old instance to the freshly-created new one.
+  //
+  // Why willDestroy instead of registerDestructor: Glimmer creates the NEW
+  // component instance BEFORE calling willDestroy on the OLD one (willDestroy
+  // is scheduled in Ember's "actions" runloop queue, which runs after
+  // rendering). This ordering is exactly what we need: by willDestroy time,
+  // the new instance is already live in liveInstances.
+  const origWillDestroy = Component.prototype.willDestroy;
+  Component.prototype.willDestroy = function () {
+    const rt = hmrRuntime();
+    if (rt) {
+      const klass = this.constructor;
+      const newClass = rt.current(klass);
+      if (newClass !== klass) {
+        // The class was swapped via HMR — dequeue the next new instance for
+        // the replacement class (FIFO matches DOM/creation order) and
+        // schedule a state transfer onto it.
+        const newInstance = rt.dequeueInstance(newClass);
+        if (newInstance) {
+          const state = getState(this, ['args']);
+          const oldInstance = this;
+          setTimeout(() => applySyncState(newInstance, state, oldInstance));
+        }
+      } else if (rt.isHmrClass(klass)) {
+        // Normal destroy (navigation, timer, conditional) — remove this
+        // instance from the live queue so it doesn't accumulate as a stale
+        // entry that update() would otherwise have to clear at the next save.
+        rt.removeInstance(klass, this);
+      }
+    }
+    return origWillDestroy?.call(this);
   };
   const setupController = Route.prototype.setupController;
   const StateCache = {};

package/dist/instance-initializers/setup-hmr-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-hmr-manager.js","sources":["../../src/instance-initializers/setup-hmr-manager.ts"],"sourcesContent":["import Route from '@ember/routing/route';\nimport Service from '@ember/service';\nimport Component from '@glimmer/component';\nimport { getInternalComponentManager } from '@glimmer/manager';\n\ninterface HotComponent extends Component<{ __hot__?: unknown }> {\n  __get_hot_state__?: () => Record<string, unknown>;\n  _hmrAccepted?: (oldInstance?: HotComponent) => void;\n  [key: string]: unknown;\n}\n\ntype Mutable<T> = {\n  -readonly [P in keyof T]: unknown;\n};\n\nfunction findPropertyDescriptor(\n  component: HotComponent | Record<string, unknown>,\n  key: string,\n) {\n  let proto = component;\n  while (proto) {\n    const desc = Object.getOwnPropertyDescriptor(proto, key);\n    if (desc) return desc;\n    proto = Object.getPrototypeOf(proto);\n  }\n}\n\n// The private property key `ember-resources`' `wrapForPlainUsage()` uses on\n// the plain object it wraps in a Proxy for `resource()` (which reactiveweb's\n// `trackedTask` uses internally) - see\n// https://github.com/NullVoxPopuli/ember-resources/blob/main/ember-resources/src/plain/index.ts.\n// Carrying such a proxy's *reference* over onto a new HMR-swapped instance\n// (instead of leaving the new instance's own, correctly-parented resource in\n// place) is unsafe: the proxy's underlying helper cache is lazily created on\n// first property read and permanently bound, at that point, to whichever\n// component instance was passed as `context` when `resource()` was called -\n// for a carried-over proxy that's always the *old*, already-destroyed\n// instance, so the first read after the swap throws \"Attempted to associate\n// a destroyable child with an object that is already destroying or\n// destroyed\" - see issue #563.\n//\n// `in` is used (rather than reading a property, or `Object.keys`/\n// `Object.prototype.toString.call`) because it's the one reflective\n// operation `wrapForPlainUsage`'s Proxy doesn't trap (no `has` handler), so\n// it forwards to a plain `[[HasProperty]]` on the underlying target without\n// ever invoking the lazy getter - it can't accidentally trigger the same\n// crash it's checking for. If `ember-resources` ever renames this key, this\n// check simply stops matching and behavior falls back to today's (already\n// broken, pre-existing) state - it does not introduce a new failure mode.\nconst RESOURCE_INTERMEDIATE_VALUE_KEY = '__Intermediate_Value__';\n\nfunction isUnsafeToCarryOver(value: unknown): boolean {\n  return (\n    (typeof value === 'object' || typeof value === 'function') &&\n    value !== null &&\n    RESOURCE_INTERMEDIATE_VALUE_KEY in value\n  );\n}\n\nfunction getState(component: HotComponent, skip: string[]) {\n  const state: Record<string, unknown> = {};\n  if (!component) {\n    return state;\n  }\n  for (const key in component) {\n    if (skip.includes(key)) continue;\n    const entry = findPropertyDescriptor(component, key);\n    const value = component[key as keyof Component];\n    \n    // Skip Service instances - they should not be synced\n    if (value instanceof Service) {\n      continue;\n    }\n    \n    // Skip Function properties - they should not be synced\n    if (typeof value === 'function') {\n      continue;\n    }\n\n    // Skip resource()-backed proxies - see isUnsafeToCarryOver above.\n    if (isUnsafeToCarryOver(value)) {\n      continue;\n    }\n\n    if (entry) {\n      // Note: don't probe `entry.value` any further here (e.g. via\n      // `Object.prototype.toString.call`) to decide whether it's a plain\n      // function - the `typeof value === 'function'` check above already\n      // covers that, and a stricter check on `entry.value` (which may be a\n      // resource proxy, e.g. reactiveweb's `trackedTask`) can trigger that\n      // proxy's `get` trap on first touch, lazily invoking a helper against\n      // this component instance - see issue #557.\n      if (entry.writable) {\n        state[key] = value;\n      }\n      if (entry.set) {\n        state[key] = value;\n      }\n    }\n  }\n  return state;\n}\n\nfunction syncState(instance: Mutable<HotComponent>) {\n  const args = instance.args as { __hot__?: { getState?: () => Record<string, unknown>; oldInstance?: HotComponent } };\n  if (args.__hot__) {\n    const oldInstance = args.__hot__.oldInstance;\n    const state =\n      (instance.__get_hot_state__ as (() => Record<string, unknown>) | undefined)?.() || args.__hot__.getState?.();\n    for (const k in state) {\n      if (instance[k as keyof HotComponent] instanceof Service) {\n        continue;\n      }\n      instance[k as keyof HotComponent] = state[k];\n    }\n    \n    // Call _hmrAccepted hook if defined\n    if (typeof instance._hmrAccepted === 'function') {\n      instance._hmrAccepted(oldInstance);\n    }\n    \n    args.__hot__.getState = () => getState(instance as HotComponent, ['args']);\n    args.__hot__.oldInstance = instance as HotComponent;\n  }\n}\n\nexport function initialize() {\n  // HMR-only: in a production build `import.meta.hot` is undefined, so this\n  // (and the manager/route monkey-patches below) is dead-code-eliminated.\n  if (!import.meta.hot) return;\n\n  const ComponentManager = getInternalComponentManager(Component);\n  const proto = Object.getPrototypeOf(ComponentManager);\n  const create = proto.create;\n  proto.create = function (...args: unknown[]) {\n    const instance = create.call(this, ...args);\n    setTimeout(() => syncState(instance.component));\n    return instance;\n  };\n\n  const setupController = Route.prototype.setupController;\n\n  const StateCache: Record<string, unknown> = {};\n\n  Route.prototype.setupController = function (...args: Parameters<typeof setupController>) {\n    const controller = args[0] as unknown as Record<string, unknown>;\n    const r = setupController.call(this, ...args);\n    const fullRouteName = this.fullRouteName;\n    const state = StateCache[fullRouteName] as { router?: Record<string, unknown>; controller?: Record<string, unknown> } || {};\n    const skip = ['_qpDelegate', 'target', 'queryParams'];\n    const routerState = getState(state.router as HotComponent, skip);\n    for (const k in routerState) {\n      (this as unknown as Record<string, unknown>)[k] = routerState[k];\n    }\n    // Only re-apply controller state onto a *new* instance (an HMR swap). On\n    // ordinary navigation it is the same singleton, and re-applying a\n    // non-`@tracked` query param onto itself trips Ember's mandatory setter.\n    if (state.controller && state.controller !== controller) {\n      const controllerState = getState(state.controller as HotComponent, skip);\n      for (const k in controllerState) {\n        (controller as Record<string, unknown>)[k] = controllerState[k];\n      }\n    }\n    StateCache[fullRouteName] = {\n      route: this,\n      controller,\n    };\n    return r;\n  };\n}\n\nexport default {\n  initialize,\n};\n"],"names":["findPropertyDescriptor","component","key","proto","desc","Object","getOwnPropertyDescriptor","getPrototypeOf","RESOURCE_INTERMEDIATE_VALUE_KEY","isUnsafeToCarryOver","value","getState","skip","state","includes","entry","Service","writable","set","syncState","instance","args","__hot__","oldInstance","__get_hot_state__","k","_hmrAccepted","initialize","import","meta","hot","ComponentManager","getInternalComponentManager","Component","create","call","setTimeout","setupController","Route","prototype","StateCache","controller","r","fullRouteName","routerState","router","controllerState","route"],"mappings":";;;;;AAeA,SAASA,sBAAsBA,CAC7BC,SAAiD,EACjDC,GAAW,EACX;EACA,IAAIC,KAAK,GAAGF,SAAS;AACrB,EAAA,OAAOE,KAAK,EAAE;IACZ,MAAMC,IAAI,GAAGC,MAAM,CAACC,wBAAwB,CAACH,KAAK,EAAED,GAAG,CAAC;IACxD,IAAIE,IAAI,EAAE,OAAOA,IAAI;AACrBD,IAAAA,KAAK,GAAGE,MAAM,CAACE,cAAc,CAACJ,KAAK,CAAC;AACtC,EAAA;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMK,+BAA+B,GAAG,wBAAwB;AAEhE,SAASC,mBAAmBA,CAACC,KAAc,EAAW;AACpD,EAAA,OACE,CAAC,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,UAAU,KACzDA,KAAK,KAAK,IAAI,IACdF,+BAA+B,IAAIE,KAAK;AAE5C;AAEA,SAASC,QAAQA,CAACV,SAAuB,EAAEW,IAAc,EAAE;EACzD,MAAMC,KAA8B,GAAG,EAAE;EACzC,IAAI,CAACZ,SAAS,EAAE;AACd,IAAA,OAAOY,KAAK;AACd,EAAA;AACA,EAAA,KAAK,MAAMX,GAAG,IAAID,SAAS,EAAE;AAC3B,IAAA,IAAIW,IAAI,CAACE,QAAQ,CAACZ,GAAG,CAAC,EAAE;AACxB,IAAA,MAAMa,KAAK,GAAGf,sBAAsB,CAACC,SAAS,EAAEC,GAAG,CAAC;AACpD,IAAA,MAAMQ,KAAK,GAAGT,SAAS,CAACC,GAAG,CAAoB;;AAE/C;IACA,IAAIQ,KAAK,YAAYM,OAAO,EAAE;AAC5B,MAAA;AACF,IAAA;;AAEA;AACA,IAAA,IAAI,OAAON,KAAK,KAAK,UAAU,EAAE;AAC/B,MAAA;AACF,IAAA;;AAEA;AACA,IAAA,IAAID,mBAAmB,CAACC,KAAK,CAAC,EAAE;AAC9B,MAAA;AACF,IAAA;AAEA,IAAA,IAAIK,KAAK,EAAE;AACT;AACA;AACA;AACA;AACA;AACA;AACA;MACA,IAAIA,KAAK,CAACE,QAAQ,EAAE;AAClBJ,QAAAA,KAAK,CAACX,GAAG,CAAC,GAAGQ,KAAK;AACpB,MAAA;MACA,IAAIK,KAAK,CAACG,GAAG,EAAE;AACbL,QAAAA,KAAK,CAACX,GAAG,CAAC,GAAGQ,KAAK;AACpB,MAAA;AACF,IAAA;AACF,EAAA;AACA,EAAA,OAAOG,KAAK;AACd;AAEA,SAASM,SAASA,CAACC,QAA+B,EAAE;AAClD,EAAA,MAAMC,IAAI,GAAGD,QAAQ,CAACC,IAA8F;EACpH,IAAIA,IAAI,CAACC,OAAO,EAAE;AAChB,IAAA,MAAMC,WAAW,GAAGF,IAAI,CAACC,OAAO,CAACC,WAAW;AAC5C,IAAA,MAAMV,KAAK,GACRO,QAAQ,CAACI,iBAAiB,IAAoD,IAAIH,IAAI,CAACC,OAAO,CAACX,QAAQ,IAAI;AAC9G,IAAA,KAAK,MAAMc,CAAC,IAAIZ,KAAK,EAAE;AACrB,MAAA,IAAIO,QAAQ,CAACK,CAAC,CAAuB,YAAYT,OAAO,EAAE;AACxD,QAAA;AACF,MAAA;AACAI,MAAAA,QAAQ,CAACK,CAAC,CAAuB,GAAGZ,KAAK,CAACY,CAAC,CAAC;AAC9C,IAAA;;AAEA;AACA,IAAA,IAAI,OAAOL,QAAQ,CAACM,YAAY,KAAK,UAAU,EAAE;AAC/CN,MAAAA,QAAQ,CAACM,YAAY,CAACH,WAAW,CAAC;AACpC,IAAA;AAEAF,IAAAA,IAAI,CAACC,OAAO,CAACX,QAAQ,GAAG,MAAMA,QAAQ,CAACS,QAAQ,EAAkB,CAAC,MAAM,CAAC,CAAC;AAC1EC,IAAAA,IAAI,CAACC,OAAO,CAACC,WAAW,GAAGH,QAAwB;AACrD,EAAA;AACF;AAEO,SAASO,UAAUA,GAAG;AAC3B;AACA;AACA,EAAA,IAAI,CAACC,MAAM,CAACC,IAAI,CAACC,GAAG,EAAE;AAEtB,EAAA,MAAMC,gBAAgB,GAAGC,2BAA2B,CAACC,SAAS,CAAC;AAC/D,EAAA,MAAM9B,KAAK,GAAGE,MAAM,CAACE,cAAc,CAACwB,gBAAgB,CAAC;AACrD,EAAA,MAAMG,MAAM,GAAG/B,KAAK,CAAC+B,MAAM;AAC3B/B,EAAAA,KAAK,CAAC+B,MAAM,GAAG,UAAU,GAAGb,IAAe,EAAE;IAC3C,MAAMD,QAAQ,GAAGc,MAAM,CAACC,IAAI,CAAC,IAAI,EAAE,GAAGd,IAAI,CAAC;IAC3Ce,UAAU,CAAC,MAAMjB,SAAS,CAACC,QAAQ,CAACnB,SAAS,CAAC,CAAC;AAC/C,IAAA,OAAOmB,QAAQ;EACjB,CAAC;AAED,EAAA,MAAMiB,eAAe,GAAGC,KAAK,CAACC,SAAS,CAACF,eAAe;EAEvD,MAAMG,UAAmC,GAAG,EAAE;EAE9CF,KAAK,CAACC,SAAS,CAACF,eAAe,GAAG,UAAU,GAAGhB,IAAwC,EAAE;AACvF,IAAA,MAAMoB,UAAU,GAAGpB,IAAI,CAAC,CAAC,CAAuC;IAChE,MAAMqB,CAAC,GAAGL,eAAe,CAACF,IAAI,CAAC,IAAI,EAAE,GAAGd,IAAI,CAAC;AAC7C,IAAA,MAAMsB,aAAa,GAAG,IAAI,CAACA,aAAa;IACxC,MAAM9B,KAAK,GAAG2B,UAAU,CAACG,aAAa,CAAC,IAAkF,EAAE;IAC3H,MAAM/B,IAAI,GAAG,CAAC,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC;IACrD,MAAMgC,WAAW,GAAGjC,QAAQ,CAACE,KAAK,CAACgC,MAAM,EAAkBjC,IAAI,CAAC;AAChE,IAAA,KAAK,MAAMa,CAAC,IAAImB,WAAW,EAAE;AAC1B,MAAA,IAAI,CAAwCnB,CAAC,CAAC,GAAGmB,WAAW,CAACnB,CAAC,CAAC;AAClE,IAAA;AACA;AACA;AACA;IACA,IAAIZ,KAAK,CAAC4B,UAAU,IAAI5B,KAAK,CAAC4B,UAAU,KAAKA,UAAU,EAAE;MACvD,MAAMK,eAAe,GAAGnC,QAAQ,CAACE,KAAK,CAAC4B,UAAU,EAAkB7B,IAAI,CAAC;AACxE,MAAA,KAAK,MAAMa,CAAC,IAAIqB,eAAe,EAAE;AAC9BL,QAAAA,UAAU,CAA6BhB,CAAC,CAAC,GAAGqB,eAAe,CAACrB,CAAC,CAAC;AACjE,MAAA;AACF,IAAA;IACAe,UAAU,CAACG,aAAa,CAAC,GAAG;AAC1BI,MAAAA,KAAK,EAAE,IAAI;AACXN,MAAAA;KACD;AACD,IAAA,OAAOC,CAAC;EACV,CAAC;AACH;AAEA,sBAAe;AACbf,EAAAA;AACF,CAAC;;;;"}
+{"version":3,"file":"setup-hmr-manager.js","sources":["../../src/instance-initializers/setup-hmr-manager.ts"],"sourcesContent":["import Route from '@ember/routing/route';\nimport Service from '@ember/service';\nimport Component from '@glimmer/component';\nimport { getInternalComponentManager } from '@glimmer/manager';\n\ninterface HotComponent extends Component {\n  __get_hot_state__?: () => Record<string, unknown>;\n  _hmrAccepted?: (oldInstance?: HotComponent) => void;\n  [key: string]: unknown;\n}\n\ntype Mutable<T> = {\n  -readonly [P in keyof T]: unknown;\n};\n\n// Accessor for the HMR runtime helpers exposed on the global by\n// virtual:ember-vite-hmr-runtime. Only set in dev/serve mode (guarded by\n// `if (!import.meta.hot)` at the call site).\ninterface HmrRuntime {\n  current: (value: unknown) => unknown;\n  isHmrClass: (value: unknown) => boolean;\n  enqueueInstance: (klass: unknown, instance: HotComponent) => void;\n  dequeueInstance: (klass: unknown) => HotComponent | null;\n  removeInstance: (klass: unknown, instance: HotComponent) => void;\n}\n\nfunction hmrRuntime(): HmrRuntime | undefined {\n  return (globalThis as unknown as { __ember_vite_hmr?: HmrRuntime }).__ember_vite_hmr;\n}\n\nfunction findPropertyDescriptor(\n  component: HotComponent | Record<string, unknown>,\n  key: string,\n) {\n  let proto = component;\n  while (proto) {\n    const desc = Object.getOwnPropertyDescriptor(proto, key);\n    if (desc) return desc;\n    proto = Object.getPrototypeOf(proto);\n  }\n}\n\n// The private property key `ember-resources`' `wrapForPlainUsage()` uses on\n// the plain object it wraps in a Proxy for `resource()` (which reactiveweb's\n// `trackedTask` uses internally) - see\n// https://github.com/NullVoxPopuli/ember-resources/blob/main/ember-resources/src/plain/index.ts.\n// Carrying such a proxy's *reference* over onto a new HMR-swapped instance\n// (instead of leaving the new instance's own, correctly-parented resource in\n// place) is unsafe: the proxy's underlying helper cache is lazily created on\n// first property read and permanently bound, at that point, to whichever\n// component instance was passed as `context` when `resource()` was called -\n// for a carried-over proxy that's always the *old*, already-destroyed\n// instance, so the first read after the swap throws \"Attempted to associate\n// a destroyable child with an object that is already destroying or\n// destroyed\" - see issue #563.\n//\n// `in` is used (rather than reading a property, or `Object.keys`/\n// `Object.prototype.toString.call`) because it's the one reflective\n// operation `wrapForPlainUsage`'s Proxy doesn't trap (no `has` handler), so\n// it forwards to a plain `[[HasProperty]]` on the underlying target without\n// ever invoking the lazy getter - it can't accidentally trigger the same\n// crash it's checking for. If `ember-resources` ever renames this key, this\n// check simply stops matching and behavior falls back to today's (already\n// broken, pre-existing) state - it does not introduce a new failure mode.\nconst RESOURCE_INTERMEDIATE_VALUE_KEY = '__Intermediate_Value__';\n\nfunction isUnsafeToCarryOver(value: unknown): boolean {\n  return (\n    (typeof value === 'object' || typeof value === 'function') &&\n    value !== null &&\n    RESOURCE_INTERMEDIATE_VALUE_KEY in value\n  );\n}\n\nfunction getState(component: HotComponent, skip: string[]) {\n  const state: Record<string, unknown> = {};\n  if (!component) {\n    return state;\n  }\n  for (const key in component) {\n    if (skip.includes(key)) continue;\n    const entry = findPropertyDescriptor(component, key);\n    const value = component[key as keyof Component];\n    \n    // Skip Service instances - they should not be synced\n    if (value instanceof Service) {\n      continue;\n    }\n    \n    // Skip Function properties - they should not be synced\n    if (typeof value === 'function') {\n      continue;\n    }\n\n    // Skip resource()-backed proxies - see isUnsafeToCarryOver above.\n    if (isUnsafeToCarryOver(value)) {\n      continue;\n    }\n\n    if (entry) {\n      // Note: don't probe `entry.value` any further here (e.g. via\n      // `Object.prototype.toString.call`) to decide whether it's a plain\n      // function - the `typeof value === 'function'` check above already\n      // covers that, and a stricter check on `entry.value` (which may be a\n      // resource proxy, e.g. reactiveweb's `trackedTask`) can trigger that\n      // proxy's `get` trap on first touch, lazily invoking a helper against\n      // this component instance - see issue #557.\n      if (entry.writable) {\n        state[key] = value;\n      }\n      if (entry.set) {\n        state[key] = value;\n      }\n    }\n  }\n  return state;\n}\n\n// Apply a stashed old-instance state to a freshly created new instance.\n// Also calls the _hmrAccepted lifecycle hook if defined on the new instance.\nfunction applySyncState(\n  instance: Mutable<HotComponent>,\n  state: Record<string, unknown>,\n  oldInstance: HotComponent | undefined,\n) {\n  for (const k in state) {\n    if (instance[k as keyof HotComponent] instanceof Service) {\n      continue;\n    }\n    instance[k as keyof HotComponent] = state[k];\n  }\n  if (typeof instance._hmrAccepted === 'function') {\n    instance._hmrAccepted(oldInstance);\n  }\n}\n\nexport function initialize() {\n  // HMR-only: in a production build `import.meta.hot` is undefined, so this\n  // (and the manager/route monkey-patches below) is dead-code-eliminated.\n  if (!import.meta.hot) return;\n\n  const ComponentManager = getInternalComponentManager(Component);\n  const proto = Object.getPrototypeOf(ComponentManager);\n  const create = proto.create;\n  proto.create = function (...args: unknown[]) {\n    const bucket = create.call(this, ...args);\n    const component = bucket.component as HotComponent;\n\n    // Enqueue this instance in the runtime's per-class FIFO queue. The runtime\n    // only enqueues when isHmrClass(klass) is true (registered HMR class), and\n    // clears the queue at update() time so user-flow stale entries are never\n    // present when willDestroy fires during an HMR swap.\n    const klass = component.constructor as object;\n    const rt = hmrRuntime();\n    if (rt?.isHmrClass(klass)) {\n      rt.enqueueInstance(klass, component);\n    }\n\n    return bucket;\n  };\n\n  // Patch willDestroy on the Component prototype to detect HMR swaps and\n  // transfer state from the old instance to the freshly-created new one.\n  //\n  // Why willDestroy instead of registerDestructor: Glimmer creates the NEW\n  // component instance BEFORE calling willDestroy on the OLD one (willDestroy\n  // is scheduled in Ember's \"actions\" runloop queue, which runs after\n  // rendering). This ordering is exactly what we need: by willDestroy time,\n  // the new instance is already live in liveInstances.\n  const origWillDestroy = Component.prototype.willDestroy;\n  Component.prototype.willDestroy = function (this: HotComponent) {\n    const rt = hmrRuntime();\n    if (rt) {\n      const klass = this.constructor as object;\n      const newClass = rt.current(klass);\n      if (newClass !== klass) {\n        // The class was swapped via HMR — dequeue the next new instance for\n        // the replacement class (FIFO matches DOM/creation order) and\n        // schedule a state transfer onto it.\n        const newInstance = rt.dequeueInstance(newClass);\n        if (newInstance) {\n          const state = getState(this, ['args']);\n          const oldInstance = this;\n          setTimeout(() => applySyncState(newInstance as Mutable<HotComponent>, state, oldInstance));\n        }\n      } else if (rt.isHmrClass(klass)) {\n        // Normal destroy (navigation, timer, conditional) — remove this\n        // instance from the live queue so it doesn't accumulate as a stale\n        // entry that update() would otherwise have to clear at the next save.\n        rt.removeInstance(klass, this);\n      }\n    }\n    return origWillDestroy?.call(this);\n  };\n\n  const setupController = Route.prototype.setupController;\n\n  const StateCache: Record<string, unknown> = {};\n\n  Route.prototype.setupController = function (...args: Parameters<typeof setupController>) {\n    const controller = args[0] as unknown as Record<string, unknown>;\n    const r = setupController.call(this, ...args);\n    const fullRouteName = this.fullRouteName;\n    const state = StateCache[fullRouteName] as { router?: Record<string, unknown>; controller?: Record<string, unknown> } || {};\n    const skip = ['_qpDelegate', 'target', 'queryParams'];\n    const routerState = getState(state.router as HotComponent, skip);\n    for (const k in routerState) {\n      (this as unknown as Record<string, unknown>)[k] = routerState[k];\n    }\n    // Only re-apply controller state onto a *new* instance (an HMR swap). On\n    // ordinary navigation it is the same singleton, and re-applying a\n    // non-`@tracked` query param onto itself trips Ember's mandatory setter.\n    if (state.controller && state.controller !== controller) {\n      const controllerState = getState(state.controller as HotComponent, skip);\n      for (const k in controllerState) {\n        (controller as Record<string, unknown>)[k] = controllerState[k];\n      }\n    }\n    StateCache[fullRouteName] = {\n      route: this,\n      controller,\n    };\n    return r;\n  };\n}\n\nexport default {\n  initialize,\n};\n"],"names":["hmrRuntime","globalThis","__ember_vite_hmr","findPropertyDescriptor","component","key","proto","desc","Object","getOwnPropertyDescriptor","getPrototypeOf","RESOURCE_INTERMEDIATE_VALUE_KEY","isUnsafeToCarryOver","value","getState","skip","state","includes","entry","Service","writable","set","applySyncState","instance","oldInstance","k","_hmrAccepted","initialize","import","meta","hot","ComponentManager","getInternalComponentManager","Component","create","args","bucket","call","klass","constructor","rt","isHmrClass","enqueueInstance","origWillDestroy","prototype","willDestroy","newClass","current","newInstance","dequeueInstance","setTimeout","removeInstance","setupController","Route","StateCache","controller","r","fullRouteName","routerState","router","controllerState","route"],"mappings":"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"}

package/dist/lib/babel-plugin/private-members.js

@@ -179,16 +179,18 @@ export function renamePrivateClassMembers(babel, classPath, programPath) {
     // function did -- left such references as native `#foo` PrivateNames
     // while the outer declaration was renamed to a Symbol, producing invalid
     // output ("Private field must be declared in an enclosing class").
+    const rewriteMemberReference = (path) => {
+        const property = path.node.property;
+        if (t.isPrivateName(property) &&
+            renamedNames.has(property.id.name) &&
+            referenceBelongsToOuterClass(path, property.id.name)) {
+            path.node.property = t.identifier(getNewName(property.id.name));
+            path.node.computed = false;
+        }
+    };
     classPath.traverse({
-        'MemberExpression|OptionalMemberExpression'(path) {
-            const property = path.node.property;
-            if (t.isPrivateName(property) &&
-                renamedNames.has(property.id.name) &&
-                referenceBelongsToOuterClass(path, property.id.name)) {
-                path.node.property = t.identifier(getNewName(property.id.name));
-                path.node.computed = false;
-            }
-        },
+        MemberExpression: rewriteMemberReference,
+        OptionalMemberExpression: rewriteMemberReference,
         BinaryExpression(path) {
             const left = path.node.left;
             if (path.node.operator === 'in' &&
@@ -266,9 +268,15 @@ function hideRenamedProperties(babel, classPath, names) {
         // `this` before `super()` has (unconditionally) run.
         const superCallStatement = ctorBody
             .get('body')
-            .find((statement) => statement.isExpressionStatement() &&
-            statement.get('expression').isCallExpression() &&
-            statement.get('expression.callee').isSuper());
+            .find((statement) => {
+            if (!statement.isExpressionStatement())
+                return false;
+            const expr = statement.get('expression');
+            if (Array.isArray(expr) || !expr.isCallExpression())
+                return false;
+            const callee = expr.get('callee');
+            return !Array.isArray(callee) && callee.isSuper();
+        });
         if (superCallStatement) {
             superCallStatement.insertAfter(hideStatements);
         }

package/dist/lib/babel-plugin/service-proxy.js

@@ -10,7 +10,7 @@ import { ImportUtil } from 'babel-import-util';
 // `renamePrivateClassMembers` (see ../private-members.ts) before this runs,
 // so this function doesn't need to special-case them at all.
 export function transformServiceExport(babel, path, state) {
-    var _a;
+    var _a, _b;
     const t = babel.types;
     // Check if this is a service file (normalize path for cross-platform compatibility)
     const normalizedFilename = (_a = state.filename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, '/');
@@ -34,7 +34,7 @@ export function transformServiceExport(babel, path, state) {
         if (binding && binding.path.isClassDeclaration()) {
             classDeclaration = binding.path
                 .node;
-            classIdentifier = classDeclaration.id;
+            classIdentifier = (_b = classDeclaration.id) !== null && _b !== void 0 ? _b : null;
             classPath =
                 binding.path;
         }

package/dist/lib/babel-plugin/template-imports.js

@@ -206,14 +206,25 @@ export function finalizeTemplateImports(babel, path, filename) {
         return;
     }
     const util = new ImportUtil(babel, path);
-    const tracked = util.import(path, '@glimmer/tracking', 'tracked');
-    util.import(path, '@glimmer/component', 'default');
+    // `current` is imported from the HMR runtime virtual module. The runtime
+    // reads `entry.current` (a @tracked cell) and returns the latest class.
+    // Using a getter here (rather than a @tracked field that gets reassigned)
+    // means Glimmer only invalidates the scope that contains the `current()`
+    // read — not the parent scope that holds the `template__imports__` object.
+    // This keeps any outer {{#let}} wrappers (e.g. for stable per-invocation
+    // ids) alive across HMR swaps of the child component.
+    const currentFn = util.import(path, 'virtual:ember-vite-hmr-runtime', 'current');
     const klass = t.classExpression(path.scope.generateUidIdentifier('Imports'), null, t.classBody([]));
     const bindings = [...hotAstProcessor.meta.importBindings].sort();
     for (const local of bindings) {
-        klass.body.body.push(t.classProperty(t.identifier(local), t.identifier(local), null, [
-            t.decorator(tracked),
-        ]));
+        // Emit: get Local() { return current(LocalBinding); }
+        // The getter closes over `LocalBinding` (the initial import value).
+        // `current()` reads `entry.current` which is @tracked in the runtime,
+        // so only the template expression that calls this getter is invalidated
+        // when the binding is updated via update(old, new).
+        klass.body.body.push(t.classMethod('get', t.identifier(local), [], t.blockStatement([
+            t.returnStatement(t.callExpression(currentFn, [t.identifier(local)])),
+        ])));
     }
     const newExp = t.newExpression(klass, []);
     const assign = t.assignmentExpression('=', t.identifier(hotAstProcessor.meta.importVar), newExp);

package/dist/lib/babel-plugin.js

@@ -54,7 +54,7 @@ export default function hotReplaceAst(babel) {
                 renamePrivateClassMembers(babel, path, programPath);
             },
             ExportDefaultDeclaration(path, state) {
-                var _a;
+                var _a, _b;
                 if (process.env.EMBER_VITE_HMR_ENABLED !== 'true') {
                     return;
                 }
@@ -62,6 +62,62 @@ export default function hotReplaceAst(babel) {
                     return;
                 }
                 transformServiceExport(babel, path, state);
+                // For every non-service default export, rewrite:
+                //   export default <expr>
+                // into:
+                //   const __hmr_default__ = <expr>;
+                //   export { __hmr_default__ as default };
+                //
+                // This gives lib/hmr.ts's appended HMR code a stable local variable
+                // name to pass to register()/update()/used() regardless of whether
+                // the export is a named class, an anonymous expression, or a compiled
+                // template. Services are excluded because they are already rewritten
+                // by transformServiceExport above with their own proxy mechanism.
+                const normalizedFilename = (_b = state.filename) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, '/');
+                if (normalizedFilename === null || normalizedFilename === void 0 ? void 0 : normalizedFilename.includes('/services/')) {
+                    return;
+                }
+                const t = babel.types;
+                const declaration = path.node.declaration;
+                const exportDefault = t.exportNamedDeclaration(null, [
+                    t.exportSpecifier(t.identifier('__hmr_default__'), t.identifier('default')),
+                ]);
+                const isClassOrFunction = declaration.type === 'ClassDeclaration' ||
+                    declaration.type === 'FunctionDeclaration';
+                let newPaths;
+                if (isClassOrFunction && declaration.id) {
+                    // A named class/function becomes a declaration statement in its own
+                    // right — just alias the identifier.
+                    newPaths = path.replaceWithMultiple([
+                        declaration,
+                        t.variableDeclaration('const', [
+                            t.variableDeclarator(t.identifier('__hmr_default__'), t.identifier(declaration.id.name)),
+                        ]),
+                        exportDefault,
+                    ]);
+                }
+                else {
+                    // Anonymous expression (template-only component, arrow fn, etc.).
+                    // An anonymous `class extends X {}` / `function () {}` is parsed as
+                    // a declaration node and must be converted to an expression to be
+                    // a valid initializer.
+                    const init = isClassOrFunction
+                        ? t.toExpression(declaration)
+                        : declaration;
+                    newPaths = path.replaceWithMultiple([
+                        t.variableDeclaration('const', [
+                            t.variableDeclarator(t.identifier('__hmr_default__'), init),
+                        ]),
+                        exportDefault,
+                    ]);
+                }
+                // Register the new `__hmr_default__` binding so later plugins (e.g.
+                // @babel/plugin-transform-typescript) can resolve the export.
+                for (const newPath of newPaths) {
+                    if (newPath.isVariableDeclaration()) {
+                        newPath.scope.registerDeclaration(newPath);
+                    }
+                }
             },
             Program(path, state) {
                 var _a;

package/dist/lib/hmr.d.ts

@@ -1,2 +1,4 @@
 import { Plugin } from 'vite';
-export declare function hmr(enableViteHmrForModes?: string[]): Plugin;
+export declare const hmrRuntimeId = "virtual:ember-vite-hmr-runtime";
+export declare function hmrRuntime(): Plugin;
+export declare function hmr(enableViteHmrForModes?: string[]): Plugin[];