ember-vite-hmr 2.0.7 → 2.1.1

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

@@ -19,7 +19,18 @@ function getState(component, skip) {
   for (const key in component) {
     if (skip.includes(key)) continue;
     const entry = findPropertyDescriptor(component, key);
-    if (entry && !(component[key] instanceof Service)) {
+    const value = component[key];
+
+    // Skip Service instances - they should not be synced
+    if (value instanceof Service) {
+      continue;
+    }
+
+    // Skip Function properties - they should not be synced
+    if (typeof value === 'function') {
+      continue;
+    }
+    if (entry) {
       if (entry.writable && !Object.prototype.toString.call(entry.value).includes('Function')) {
         state[key] = component[key];
       }
@@ -31,12 +42,16 @@ function getState(component, skip) {
   return state;
 }
 function syncState(instance) {
-  if (instance.args.__hot__) {
-    const state = instance.__get_hot_state__?.() || instance.args.__hot__.getState?.();
+  const args = instance.args;
+  if (args.__hot__) {
+    const state = instance.__get_hot_state__?.() || args.__hot__.getState?.();
     for (const k in state) {
+      if (instance[k] instanceof Service) {
+        continue;
+      }
       instance[k] = state[k];
     }
-    instance.args.__hot__.getState = () => getState(instance, ['args']);
+    args.__hot__.getState = () => getState(instance, ['args']);
   }
 }
 function initialize() {
@@ -52,7 +67,6 @@ function initialize() {
   const StateCache = {};
   Route.prototype.setupController = function (...args) {
     const controller = args[0];
-    // @ts-ignore
     const r = setupController.call(this, ...args);
     const fullRouteName = this.fullRouteName;
     const state = StateCache[fullRouteName] || {};

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 Controller from '@ember/controller';\nimport Service from '@ember/service';\nimport Component from '@glimmer/component';\n// @ts-ignore\nimport { getInternalComponentManager } from '@glimmer/manager';\n\ninterface HotComponent extends Component<{ __hot__?: any }> {\n  __get_hot_state__?: () => Record<string, any>;\n}\n\ntype Mutable<T> = {\n  -readonly [P in keyof T]: any;\n};\n\nfunction findPropertyDescriptor(component: Object, key: string) {\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\nfunction getState(component: HotComponent, skip: string[]) {\n  const state: Record<string, any> = {};\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    if (entry && !(component[key as keyof Component] instanceof Service)) {\n      if (\n        entry.writable &&\n        !Object.prototype.toString.call(entry.value).includes('Function')\n      ) {\n        state[key] = component[key as keyof Component];\n      }\n      if (entry.set) {\n        state[key] = component[key as keyof Component];\n      }\n    }\n  }\n  return state;\n}\n\nfunction syncState(instance: Mutable<HotComponent>) {\n  if (instance.args.__hot__) {\n    const state =\n      instance.__get_hot_state__?.() || instance.args.__hot__.getState?.();\n    for (const k in state) {\n      instance[k as keyof HotComponent] = state[k];\n    }\n    instance.args.__hot__.getState = () => getState(instance, ['args']);\n  }\n}\n\nexport function initialize() {\n  const ComponentManager = getInternalComponentManager(Component);\n  const proto = Object.getPrototypeOf(ComponentManager);\n  const create = proto.create;\n  proto.create = function (...args: any[]) {\n    const instance = create.call(this, ...args);\n    syncState(instance.component);\n    return instance;\n  };\n\n  const setupController = Route.prototype.setupController;\n\n  const StateCache: Record<string, any> = {};\n\n  Route.prototype.setupController = function (...args: any[]) {\n    const controller = args[0];\n    // @ts-ignore\n    const r = setupController.call(this, ...args);\n    const fullRouteName = this.fullRouteName;\n    const state = StateCache[fullRouteName] || {};\n    const skip = ['_qpDelegate', 'target', 'queryParams'];\n    const routerState = getState(state.router, skip);\n    const controllerState = getState(state.controller, skip);\n    for (const k in routerState) {\n      (this as any)[k] = routerState[k];\n    }\n    for (const k in controllerState) {\n      controller[k] = controllerState[k];\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","getState","skip","state","includes","entry","Service","writable","prototype","toString","call","value","set","syncState","instance","args","__hot__","__get_hot_state__","k","initialize","ComponentManager","getInternalComponentManager","Component","create","setupController","Route","StateCache","controller","r","fullRouteName","routerState","router","controllerState","route"],"mappings":"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"}
+{"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  [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\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    if (entry) {\n      if (\n        entry.writable &&\n        !Object.prototype.toString.call(entry.value).includes('Function')\n      ) {\n        state[key] = component[key as keyof Component];\n      }\n      if (entry.set) {\n        state[key] = component[key as keyof Component];\n      }\n    }\n  }\n  return state;\n}\n\nfunction syncState(instance: Mutable<HotComponent>) {\n  const args = instance.args as { __hot__?: { getState?: () => Record<string, unknown> } };\n  if (args.__hot__) {\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    args.__hot__.getState = () => getState(instance as HotComponent, ['args']);\n  }\n}\n\nexport function initialize() {\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    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    const controllerState = getState(state.controller as HotComponent, skip);\n    for (const k in routerState) {\n      (this as unknown as Record<string, unknown>)[k] = routerState[k];\n    }\n    for (const k in controllerState) {\n      (controller as Record<string, unknown>)[k] = controllerState[k];\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","getState","skip","state","includes","entry","value","Service","writable","prototype","toString","call","set","syncState","instance","args","__hot__","__get_hot_state__","k","initialize","ComponentManager","getInternalComponentManager","Component","create","setupController","Route","StateCache","controller","r","fullRouteName","routerState","router","controllerState","route"],"mappings":"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"}

package/dist/instance-initializers/vite-hot-reload.js

@@ -5,8 +5,10 @@ import { debounce, next } from '@ember/runloop';
 function patchResolver(application) {
   application.__container__.lookup('service:vite-hot-reload');
   const resolver = application.__registry__.resolver?._fallback || (application.__registry__.fallback?.resolver)._fallback || application.__registry__.fallback?.resolver || application.__registry__.resolver;
-  const resolverResolve = resolver.resolve;
-  resolver.resolve = function (name) {
+  if (!resolver) return;
+  const resolverWithResolve = resolver;
+  const resolverResolve = resolverWithResolve.resolve;
+  resolverWithResolve.resolve = function (name) {
     name = name.replace(/--hot-version--.*$/, '');
     return resolverResolve.call(this, name);
   };
@@ -15,13 +17,13 @@ function supportErrorRecovery(appInstance) {
   const bodyHtml = globalThis.document.body.cloneNode(true);
   const renderer = appInstance.__container__.lookup('renderer:-dom');
   const router = appInstance.__container__.lookup('service:router');
-  const warn = console.warn;
+  const warn = globalThis.console.warn;
   let scheduleRerender = false;
   async function rerender() {
     if (!scheduleRerender) return;
     scheduleRerender = false;
     const applicationRouter = appInstance.__container__.lookup('route:application');
-    applicationRouter._router._toplevelView.destroy();
+    applicationRouter._router._toplevelView?.destroy();
     applicationRouter._router._toplevelView = null;
     renderer._clearAllRoots();
     globalThis.document.body = bodyHtml.cloneNode(true);
@@ -33,11 +35,11 @@ function supportErrorRecovery(appInstance) {
   if (import.meta.hot) {
     import.meta.hot.on('vite:beforeUpdate', () => debounce(rerender, 100));
   }
-  console.warn = function (...args) {
+  globalThis.console.warn = function (...args) {
     if (args[0].includes('Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.')) {
       scheduleRerender = true;
     }
-    warn.call(console, ...args);
+    warn.call(globalThis.console, ...args);
   };
 }
 function initialize(application) {

package/dist/instance-initializers/vite-hot-reload.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-hot-reload.js","sources":["../../src/instance-initializers/vite-hot-reload.ts"],"sourcesContent":["/// <reference types=\"../../types/global\" />\n\nimport ApplicationInstance from '@ember/application/instance';\nimport { debounce, next } from '@ember/runloop';\nimport RouterService from '@ember/routing/router-service';\nimport { Renderer } from '@ember/-internals/glimmer/lib/renderer';\n\nfunction patchResolver(application: ApplicationInstance) {\n  application.__container__.lookup('service:vite-hot-reload');\n  const resolver =\n    (application.__registry__.resolver as any)?._fallback ||\n    (application.__registry__.fallback?.resolver as any)._fallback ||\n    (application.__registry__.fallback?.resolver as any) ||\n    application.__registry__.resolver;\n  const resolverResolve = resolver.resolve;\n  resolver.resolve = function (name: string) {\n    name = name.replace(/--hot-version--.*$/, '');\n    return resolverResolve.call(this, name);\n  };\n}\n\nfunction supportErrorRecovery(appInstance: ApplicationInstance) {\n  const bodyHtml = globalThis.document.body.cloneNode(true);\n  const renderer = appInstance.__container__.lookup(\n    'renderer:-dom',\n  ) as Renderer;\n  const router = appInstance.__container__.lookup(\n    'service:router',\n  ) as RouterService;\n  const warn = console.warn;\n  let scheduleRerender = false;\n  async function rerender() {\n    if (!scheduleRerender) return;\n    scheduleRerender = false;\n    const applicationRouter = appInstance.__container__.lookup(\n      'route:application',\n    ) as any;\n    applicationRouter._router._toplevelView.destroy();\n    applicationRouter._router._toplevelView = null;\n    (renderer as any)._clearAllRoots();\n    globalThis.document.body = bodyHtml.cloneNode(true) as any;\n    next(() => {\n      const transition = router.refresh();\n      applicationRouter.setup(applicationRouter.context, transition);\n    });\n  }\n  if (import.meta.hot) {\n    import.meta.hot.on('vite:beforeUpdate', () => debounce(rerender, 100));\n  }\n  console.warn = function (...args) {\n    if (\n      args[0].includes(\n        'Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.',\n      )\n    ) {\n      scheduleRerender = true;\n    }\n    warn.call(console, ...args);\n  };\n}\n\nexport function initialize(application: ApplicationInstance) {\n  patchResolver(application);\n  supportErrorRecovery(application);\n}\n\nexport default {\n  initialize,\n};"],"names":["patchResolver","application","__container__","lookup","resolver","__registry__","_fallback","fallback","resolverResolve","resolve","name","replace","call","supportErrorRecovery","appInstance","bodyHtml","globalThis","document","body","cloneNode","renderer","router","warn","console","scheduleRerender","rerender","applicationRouter","_router","_toplevelView","destroy","_clearAllRoots","next","transition","refresh","setup","context","import","meta","hot","on","debounce","args","includes","initialize"],"mappings":";;AAAA;;AAOA,SAASA,aAAaA,CAACC,WAAgC,EAAE;AACvDA,EAAAA,WAAW,CAACC,aAAa,CAACC,MAAM,CAAC,yBAAyB,CAAC;AAC3D,EAAA,MAAMC,QAAQ,GACXH,WAAW,CAACI,YAAY,CAACD,QAAQ,EAAUE,SAAS,IACrD,CAACL,WAAW,CAACI,YAAY,CAACE,QAAQ,EAAEH,QAAQ,EAASE,SAAS,IAC7DL,WAAW,CAACI,YAAY,CAACE,QAAQ,EAAEH,QAAgB,IACpDH,WAAW,CAACI,YAAY,CAACD,QAAQ;AACnC,EAAA,MAAMI,eAAe,GAAGJ,QAAQ,CAACK,OAAO;AACxCL,EAAAA,QAAQ,CAACK,OAAO,GAAG,UAAUC,IAAY,EAAE;IACzCA,IAAI,GAAGA,IAAI,CAACC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC;AAC7C,IAAA,OAAOH,eAAe,CAACI,IAAI,CAAC,IAAI,EAAEF,IAAI,CAAC;EACzC,CAAC;AACH;AAEA,SAASG,oBAAoBA,CAACC,WAAgC,EAAE;EAC9D,MAAMC,QAAQ,GAAGC,UAAU,CAACC,QAAQ,CAACC,IAAI,CAACC,SAAS,CAAC,IAAI,CAAC;EACzD,MAAMC,QAAQ,GAAGN,WAAW,CAACZ,aAAa,CAACC,MAAM,CAC/C,eACF,CAAa;EACb,MAAMkB,MAAM,GAAGP,WAAW,CAACZ,aAAa,CAACC,MAAM,CAC7C,gBACF,CAAkB;AAClB,EAAA,MAAMmB,IAAI,GAAGC,OAAO,CAACD,IAAI;EACzB,IAAIE,gBAAgB,GAAG,KAAK;EAC5B,eAAeC,QAAQA,GAAG;IACxB,IAAI,CAACD,gBAAgB,EAAE;AACvBA,IAAAA,gBAAgB,GAAG,KAAK;IACxB,MAAME,iBAAiB,GAAGZ,WAAW,CAACZ,aAAa,CAACC,MAAM,CACxD,mBACF,CAAQ;AACRuB,IAAAA,iBAAiB,CAACC,OAAO,CAACC,aAAa,CAACC,OAAO,EAAE;AACjDH,IAAAA,iBAAiB,CAACC,OAAO,CAACC,aAAa,GAAG,IAAI;IAC7CR,QAAQ,CAASU,cAAc,EAAE;IAClCd,UAAU,CAACC,QAAQ,CAACC,IAAI,GAAGH,QAAQ,CAACI,SAAS,CAAC,IAAI,CAAQ;AAC1DY,IAAAA,IAAI,CAAC,MAAM;AACT,MAAA,MAAMC,UAAU,GAAGX,MAAM,CAACY,OAAO,EAAE;MACnCP,iBAAiB,CAACQ,KAAK,CAACR,iBAAiB,CAACS,OAAO,EAAEH,UAAU,CAAC;AAChE,IAAA,CAAC,CAAC;AACJ,EAAA;AACA,EAAA,IAAII,MAAM,CAACC,IAAI,CAACC,GAAG,EAAE;AACnBF,IAAAA,MAAM,CAACC,IAAI,CAACC,GAAG,CAACC,EAAE,CAAC,mBAAmB,EAAE,MAAMC,QAAQ,CAACf,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxE,EAAA;AACAF,EAAAA,OAAO,CAACD,IAAI,GAAG,UAAU,GAAGmB,IAAI,EAAE;IAChC,IACEA,IAAI,CAAC,CAAC,CAAC,CAACC,QAAQ,CACd,6KACF,CAAC,EACD;AACAlB,MAAAA,gBAAgB,GAAG,IAAI;AACzB,IAAA;AACAF,IAAAA,IAAI,CAACV,IAAI,CAACW,OAAO,EAAE,GAAGkB,IAAI,CAAC;EAC7B,CAAC;AACH;AAEO,SAASE,UAAUA,CAAC1C,WAAgC,EAAE;EAC3DD,aAAa,CAACC,WAAW,CAAC;EAC1BY,oBAAoB,CAACZ,WAAW,CAAC;AACnC;AAEA,oBAAe;AACb0C,EAAAA;AACF,CAAC;;;;"}
+{"version":3,"file":"vite-hot-reload.js","sources":["../../src/instance-initializers/vite-hot-reload.ts"],"sourcesContent":["/// <reference types=\"../../types/global\" />\n\nimport ApplicationInstance from '@ember/application/instance';\nimport { debounce, next } from '@ember/runloop';\nimport RouterService from '@ember/routing/router-service';\nimport { Renderer } from '@ember/-internals/glimmer/lib/renderer';\n\nfunction patchResolver(application: ApplicationInstance) {\n  application.__container__.lookup('service:vite-hot-reload');\n  const resolver =\n    (application.__registry__.resolver as { _fallback?: unknown })?._fallback ||\n    (application.__registry__.fallback?.resolver as { _fallback?: unknown })\n      ._fallback ||\n    (application.__registry__.fallback?.resolver as unknown) ||\n    application.__registry__.resolver;\n  \n  if (!resolver) return;\n  \n  const resolverWithResolve = resolver as { resolve: (name: string) => unknown };\n  const resolverResolve = resolverWithResolve.resolve;\n  resolverWithResolve.resolve = function (name: string) {\n    name = name.replace(/--hot-version--.*$/, '');\n    return resolverResolve.call(this, name);\n  };\n}\n\nfunction supportErrorRecovery(appInstance: ApplicationInstance) {\n  const bodyHtml = globalThis.document.body.cloneNode(true);\n  const renderer = appInstance.__container__.lookup(\n    'renderer:-dom',\n  ) as Renderer;\n  const router = appInstance.__container__.lookup(\n    'service:router',\n  ) as RouterService;\n  const warn = globalThis.console.warn;\n  let scheduleRerender = false;\n  async function rerender() {\n    if (!scheduleRerender) return;\n    scheduleRerender = false;\n    const applicationRouter = appInstance.__container__.lookup(\n      'route:application',\n    ) as {\n      _router: { _toplevelView: { destroy: () => void } | null };\n      context: unknown;\n      setup: (context: unknown, transition: unknown) => void;\n    };\n    applicationRouter._router._toplevelView?.destroy();\n    applicationRouter._router._toplevelView = null;\n    (renderer as unknown as { _clearAllRoots: () => void })._clearAllRoots();\n    globalThis.document.body = bodyHtml.cloneNode(true) as HTMLBodyElement;\n    next(() => {\n      const transition = router.refresh();\n      applicationRouter.setup(applicationRouter.context, transition);\n    });\n  }\n  if (import.meta.hot) {\n    import.meta.hot.on('vite:beforeUpdate', () => debounce(rerender, 100));\n  }\n  globalThis.console.warn = function (...args) {\n    if (\n      args[0].includes(\n        'Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.',\n      )\n    ) {\n      scheduleRerender = true;\n    }\n    warn.call(globalThis.console, ...args);\n  };\n}\n\nexport function initialize(application: ApplicationInstance) {\n  patchResolver(application);\n  supportErrorRecovery(application);\n}\n\nexport default {\n  initialize,\n};\n"],"names":["patchResolver","application","__container__","lookup","resolver","__registry__","_fallback","fallback","resolverWithResolve","resolverResolve","resolve","name","replace","call","supportErrorRecovery","appInstance","bodyHtml","globalThis","document","body","cloneNode","renderer","router","warn","console","scheduleRerender","rerender","applicationRouter","_router","_toplevelView","destroy","_clearAllRoots","next","transition","refresh","setup","context","import","meta","hot","on","debounce","args","includes","initialize"],"mappings":"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"}

package/dist/lib/babel-plugin.d.ts

@@ -1,7 +1,7 @@
 import { PluginObj } from '@babel/core';
 import { Program } from '@babel/types';
 import type * as Babel from '@babel/core';
-import * as glimmer from '@glimmer/syntax';
+import { NodeVisitor } from '@glimmer/syntax';
 interface ASTPluginEnvironment {
     locals: string[];
     filename: string;
@@ -13,19 +13,21 @@ declare class HotAstProcessor {
     counter: number;
     meta: {
         locals: Set<string>;
-        importVar: any;
+        importVar: string | null;
         importBindings: Set<string>;
         babelProgram?: Program;
     };
     didCreateImportClass: boolean;
     constructor();
     reset(): void;
-    transform(env: ASTPluginEnvironment): any;
+    transform(env: ASTPluginEnvironment): {
+        visitor: Record<string, unknown>;
+    };
     buildVisitor({ importVar, importBindings, babelProgram, }: {
         importVar: string;
         importBindings: Set<string>;
         babelProgram: Program;
-    }): glimmer.NodeVisitor;
+    }): NodeVisitor;
 }
 export declare const hotAstProcessor: HotAstProcessor;
 export default function hotReplaceAst(babel: typeof Babel): PluginObj;

package/dist/lib/babel-plugin.js

@@ -37,56 +37,6 @@ exports.hotAstProcessor = void 0;
 exports.default = hotReplaceAst;
 const glimmer = __importStar(require("@glimmer/syntax"));
 const babel_import_util_1 = require("babel-import-util");
-const builtInComponents = ['LinkTo'];
-const builtInHelpers = [
-    '-get-dynamic-var',
-    '-element',
-    '-lf-get-outlet-state',
-    '-in-element',
-    'in-element',
-    '-with-dynamic-vars',
-    'action',
-    'array',
-    'component',
-    'concat',
-    'debugger',
-    'each',
-    'each-in',
-    'fn',
-    'get',
-    'has-block',
-    'has-block-params',
-    'hasBlock',
-    'hasBlockParams',
-    'hash',
-    'if',
-    'input',
-    'let',
-    'link-to',
-    'loc',
-    'log',
-    'mount',
-    'mut',
-    'on',
-    'outlet',
-    'partial',
-    'query-params',
-    'readonly',
-    'textarea',
-    'unbound',
-    'unless',
-    'with',
-    'yield',
-    'modifier',
-    'helper',
-];
-function dasherize(str) {
-    return str
-        .trim()
-        .split(/\.?(?=[A-Z])/)
-        .join('-')
-        .toLowerCase();
-}
 class HotAstProcessor {
     constructor() {
         this.options = {
@@ -109,7 +59,7 @@ class HotAstProcessor {
     }
     transform(env) {
         var _a;
-        if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
+        if (process.env.EMBER_VITE_HMR_ENABLED !== 'true') {
             return {
                 visitor: {},
             };
@@ -124,10 +74,6 @@ class HotAstProcessor {
             nameHint: 'template__imports__',
         });
         meta.importVar = meta.importVar || importVar;
-        const findImport = function findImport(specifier) {
-            return meta.babelProgram.body.find((b) => b.type === 'ImportDeclaration' &&
-                b.specifiers.some((s) => s.local.name === specifier));
-        };
         return {
             visitor: Object.assign({}, this.buildVisitor({
                 importVar,
@@ -180,7 +126,7 @@ class HotAstProcessor {
                 if (node.original === 'helper' ||
                     node.original === 'component' ||
                     node.original === 'modifier') {
-                    node.original;
+                    // node.original;
                     const parent = p.parentNode;
                     if (typeof parent.params[0].original !==
                         'string') {
@@ -228,9 +174,7 @@ class HotAstProcessor {
 }
 exports.hotAstProcessor = new HotAstProcessor();
 function hotReplaceAst(babel) {
-    let t = babel.types;
-    let imports = [];
-    let importMap = {};
+    const t = babel.types;
     return {
         name: 'a-hot-reload-imports',
         pre(file) {
@@ -238,20 +182,212 @@ function hotReplaceAst(babel) {
             exports.hotAstProcessor.meta.babelProgram = file.ast.program;
         },
         visitor: {
+            ExportDefaultDeclaration(path, state) {
+                var _a, _b;
+                if (process.env.EMBER_VITE_HMR_ENABLED !== 'true') {
+                    return;
+                }
+                if ((_a = state.filename) === null || _a === void 0 ? void 0 : _a.includes('node_modules')) {
+                    return;
+                }
+                // Check if this is a service file (normalize path for cross-platform compatibility)
+                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 declaration = path.node.declaration;
+                // Handle both inline class declaration and identifier reference
+                let classDeclaration = null;
+                let classIdentifier = null;
+                if (declaration.type === 'ClassDeclaration' && declaration.id) {
+                    // Case 1: export default class MyService extends Service { ... }
+                    classDeclaration = declaration;
+                    classIdentifier = declaration.id;
+                }
+                else if (declaration.type === 'Identifier') {
+                    // Case 2: class MyService extends Service { ... } \n export default MyService;
+                    const binding = path.scope.getBinding(declaration.name);
+                    if (binding && binding.path.isClassDeclaration()) {
+                        classDeclaration = binding.path
+                            .node;
+                        classIdentifier = classDeclaration.id;
+                    }
+                }
+                if (!classDeclaration || !classIdentifier) {
+                    return;
+                }
+                if (classIdentifier.name.endsWith('HmrProxy')) {
+                    return;
+                }
+                // Check if it extends Service
+                const superClass = classDeclaration.superClass;
+                if (!superClass ||
+                    ((superClass.type !== 'Identifier' ||
+                        superClass.name !== 'Service') &&
+                        superClass.type !== 'MemberExpression')) {
+                    return;
+                }
+                // Get the program path for ImportUtil
+                const programPath = path.findParent((p) => p.isProgram());
+                if (!programPath) {
+                    return;
+                }
+                const util = new babel_import_util_1.ImportUtil(babel, programPath);
+                const tracked = util.import(programPath, '@glimmer/tracking', 'tracked');
+                const Service = util.import(programPath, '@ember/service', 'default');
+                const originalClassName = classIdentifier.name;
+                const proxyClassName = `${originalClassName}HmrProxy`;
+                const implVarName = `_${originalClassName}Impl`;
+                const proxyVarName = `_${originalClassName}Proxy`;
+                // Keep the original class as-is, just remove it from export
+                // We'll add it back as a non-exported class
+                // Create the HMR proxy service class
+                const proxyClass = t.classDeclaration(t.identifier(proxyClassName), Service, t.classBody([
+                    // static Impl = OriginalService (reference to the original class)
+                    t.classProperty(t.identifier('Impl'), t.identifier(originalClassName), null, null, false, true),
+                    // @tracked _delegate = new _OriginalServiceImpl()
+                    t.classProperty(t.identifier('_delegate'), t.newExpression(t.identifier(implVarName), []), null, [t.decorator(tracked)], false, false),
+                    // constructor
+                    t.classMethod('constructor', t.identifier('constructor'), [t.restElement(t.identifier('args'))], t.blockStatement([
+                        t.expressionStatement(t.callExpression(t.super(), [
+                            t.spreadElement(t.identifier('args')),
+                        ])),
+                        t.ifStatement(t.unaryExpression('!', t.identifier(proxyVarName)), t.blockStatement([
+                            t.expressionStatement(t.assignmentExpression('=', t.identifier(proxyVarName), t.thisExpression())),
+                        ])),
+                        t.returnStatement(t.newExpression(t.identifier('Proxy'), [
+                            t.thisExpression(),
+                            t.objectExpression([
+                                t.objectMethod('method', t.identifier('get'), [t.identifier('target'), t.identifier('prop')], t.blockStatement([
+                                    t.ifStatement(t.binaryExpression('===', t.identifier('prop'), t.stringLiteral('_delegate')), t.returnStatement(t.memberExpression(t.identifier('target'), t.identifier('_delegate')))),
+                                    t.returnStatement(t.memberExpression(t.memberExpression(t.identifier('target'), t.identifier('_delegate')), t.identifier('prop'), true)),
+                                ])),
+                                t.objectMethod('method', t.identifier('set'), [
+                                    t.identifier('target'),
+                                    t.identifier('prop'),
+                                    t.identifier('value'),
+                                ], t.blockStatement([
+                                    t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.memberExpression(t.identifier('target'), t.identifier('_delegate')), t.identifier('prop'), true), t.identifier('value'))),
+                                    t.returnStatement(t.booleanLiteral(true)),
+                                ])),
+                            ]),
+                        ])),
+                    ])),
+                    // willDestroy
+                    t.classMethod('method', t.identifier('willDestroy'), [], t.blockStatement([
+                        t.expressionStatement(t.callExpression(t.memberExpression(t.super(), t.identifier('willDestroy')), [])),
+                        t.expressionStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('_delegate')), t.identifier('willDestroy')), [])),
+                    ])),
+                ]));
+                // Create variable declarations with unique names to avoid conflicts
+                const currentImplDeclaration = t.variableDeclaration('let', [
+                    t.variableDeclarator(t.identifier(implVarName), t.identifier(originalClassName)),
+                ]);
+                const currentProxyDeclaration = t.variableDeclaration('let', [
+                    t.variableDeclarator(t.identifier(proxyVarName), t.nullLiteral()),
+                ]);
+                // For Case 1 (inline class), we need to keep the class as non-exported
+                // For Case 2 (separate declaration), the class already exists, so we don't recreate it
+                if (declaration.type === 'ClassDeclaration') {
+                    // Case 1: Inline class export - create a non-exported version
+                    const originalClass = t.classDeclaration(classIdentifier, classDeclaration.superClass, classDeclaration.body, classDeclaration.decorators || []);
+                    // Replace the export with all the necessary declarations
+                    // IMPORTANT: Class must be declared BEFORE the variables that reference it
+                    path.replaceWithMultiple([
+                        originalClass, // The original class (no longer exported) - MUST BE FIRST
+                        currentImplDeclaration,
+                        currentProxyDeclaration,
+                        t.exportDefaultDeclaration(proxyClass), // Export the proxy class
+                    ]);
+                }
+                else {
+                    // Case 2: Separate declaration - class already exists, just replace the export
+                    path.replaceWithMultiple([
+                        currentImplDeclaration,
+                        currentProxyDeclaration,
+                        t.exportDefaultDeclaration(proxyClass), // Export the proxy class
+                    ]);
+                }
+                // Add HMR code after the export using babel template
+                if (programPath) {
+                    const hmrCode = `
+            if (import.meta.hot) {
+              import.meta.hot.accept((newModule) => {
+                if (import.meta.hot.data._hotReload && newModule?.default?.Impl) {
+                  import.meta.hot.data._hotReload(newModule.default.Impl);
+                }
+              });
+              
+              import.meta.hot.data._hotReload = import.meta.hot.data._hotReload || function(NewImpl) {
+                // Skip reload if no instance has been created yet
+                if (!${proxyVarName}) {
+                  ${implVarName} = NewImpl;
+                  return;
+                }
+                
+                const oldDelegate = ${proxyVarName}._delegate;
+                ${implVarName} = NewImpl;
+                const newDelegate = new ${implVarName}();
+                ${proxyVarName}._delegate = newDelegate;
+                
+                // Sync state from old to new while keeping new implementation defaults
+                for (const key in oldDelegate) {
+                  const descriptor =
+                    Object.getOwnPropertyDescriptor(oldDelegate, key) ||
+                    Object.getOwnPropertyDescriptor(Object.getPrototypeOf(oldDelegate), key);
+                  const hasOwnDefault = Object.prototype.hasOwnProperty.call(newDelegate, key);
+                  const currentValue = newDelegate[key];
+                  const previousValue = oldDelegate[key];
+                  
+                  // Skip Service instances - they should not be synced
+                  if (previousValue instanceof Service) {
+                    continue;
+                  }
+                  
+                  // Skip Function properties - they should not be synced
+                  if (typeof previousValue === 'function') {
+                    continue;
+                  }
+                  
+                  const shouldSync =
+                    !!descriptor &&
+                    (descriptor.writable || descriptor.set || Object.prototype.hasOwnProperty.call(oldDelegate, key)) &&
+                    (!hasOwnDefault || currentValue === previousValue);
+
+                  if (shouldSync) {
+                    try {
+                      newDelegate[key] = previousValue;
+                    } catch (e) {
+                      // Skip non-writable properties
+                    }
+                  }
+                }
+                
+                if (oldDelegate.willDestroy) {
+                  oldDelegate.willDestroy();
+                }
+              };
+            }
+          `;
+                    const template = babel.template.statements(hmrCode);
+                    programPath.pushContainer('body', template());
+                }
+            },
             Program(path, state) {
                 var _a;
-                if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
+                if (process.env.EMBER_VITE_HMR_ENABLED !== 'true') {
                     return;
                 }
                 if ((_a = state.filename) === null || _a === void 0 ? void 0 : _a.includes('node_modules')) {
                     return;
                 }
-                if (!exports.hotAstProcessor.meta.importVar || exports.hotAstProcessor.meta.importBindings.size === 0) {
+                if (!exports.hotAstProcessor.meta.importVar ||
+                    exports.hotAstProcessor.meta.importBindings.size === 0) {
                     return;
                 }
                 const util = new babel_import_util_1.ImportUtil(babel, path);
                 const tracked = util.import(path, '@glimmer/tracking', 'tracked');
-                const GlimmerComponent = util.import(path, '@glimmer/component', 'default');
+                util.import(path, '@glimmer/component', 'default');
                 const klass = t.classExpression(path.scope.generateUidIdentifier('Imports'), null, t.classBody([]));
                 const bindings = [...exports.hotAstProcessor.meta.importBindings].sort();
                 for (const local of bindings) {
@@ -264,8 +400,7 @@ function hotReplaceAst(babel) {
                 const varDeclaration = path.node.body.findIndex((e) => e.type === 'VariableDeclaration' &&
                     e.declarations[0].id.name ===
                         exports.hotAstProcessor.meta.importVar) + 1;
-                const lastImportIndex = // @ts-ignore
-                 path.node.body.findLastIndex((e) => e.type === 'ImportDeclaration') + 1;
+                const lastImportIndex = path.node.body.findLastIndex((e) => e.type === 'ImportDeclaration') + 1;
                 path.node.body.splice(Math.max(varDeclaration, lastImportIndex), 0, t.expressionStatement(assign));
                 // Export metadata about tracked imports for hmr.ts to use
                 const importMetadata = t.variableDeclaration('const', [

package/dist/lib/hmr.js

@@ -43,11 +43,22 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { createComputeRef } from "@glimmer/reference";
 import { curry } from '@glimmer/runtime';
+import { registerDestructor } from '@ember/destroyable';
 
 function notAny(...yields) {
   return !yields.some((y) => !!y); 
 }
 
+const hotCallbacks = new Set();
+
+if (import.meta.hot) {
+  import.meta.hot.accept('${imp}', (module) => {
+    for (const callback of hotCallbacks) {
+      callback(module);
+    }
+  });
+}
+
 export default class HotComponent extends Component {
   @tracked curried;
   hot = {};
@@ -61,12 +72,16 @@ export default class HotComponent extends Component {
     const CurriedComponent = 0;
     this.curried = curry(CurriedComponent, TargetComponent, owner, { positional, named});
     if (import.meta.hot) {
-      // Rehydrate any saved state
-      import.meta.hot.accept('${imp}', (module) => {
+      const callback = (module) => {
         this.curried = curry(CurriedComponent, module.default, owner, { positional, named});
-      })
+      };
+      hotCallbacks.add(callback);
+      registerDestructor(this, () => {
+        hotCallbacks.delete(callback);
+      });
     }
   }
+
   <template>
     ${generateContent(yields)}
   </template>
@@ -108,7 +123,7 @@ function normalizePath(inputPath) {
 }
 const virtualPrefix = '/ember-vite-hmr/virtual/component:';
 function hmr(enableViteHmrForModes = ['development']) {
-    let conf;
+    // let conf: any;
     let server;
     return {
         name: 'hmr-plugin',
@@ -117,8 +132,8 @@ function hmr(enableViteHmrForModes = ['development']) {
             server = s;
         },
         configResolved(config) {
-            conf = config;
-            process.env['EMBER_VITE_HMR_ENABLED'] = enableViteHmrForModes
+            // conf = config;
+            process.env.EMBER_VITE_HMR_ENABLED = enableViteHmrForModes
                 .includes(config.mode)
                 .toString();
         },
@@ -128,7 +143,8 @@ function hmr(enableViteHmrForModes = ['development']) {
                     return id;
                 }
                 if (importer === null || importer === void 0 ? void 0 : importer.startsWith(virtualPrefix)) {
-                    importer = path_1.default.join(process.cwd(), 'package.json');
+                    const newImporter = path_1.default.join(process.cwd(), 'package.json');
+                    importer = newImporter;
                     return this.resolve(id, importer, meta);
                 }
                 if (id.startsWith(virtualPrefix)) {
@@ -143,7 +159,7 @@ function hmr(enableViteHmrForModes = ['development']) {
                     return id;
                 }
                 if (id === '/ember-vite-hmr/services/vite-hot-reload') {
-                    return this.resolve('ember-vite-hmr/services/vite-hot-reload', path_1.default.join(process.cwd(), 'package.json'), meta);
+                    return this.resolve('ember-vite-hmr/services/vite-hot-reload', path_1.default.resolve(process.cwd(), 'package.json'), meta);
                 }
             });
         },
@@ -166,7 +182,6 @@ function hmr(enableViteHmrForModes = ['development']) {
                     if (filename.includes('__vpc__')) {
                         filename = filename.split('__vpc__')[0];
                     }
-                    // @ts-ignore
                     const res = yield server.transformRequest(filename);
                     const content = res === null || res === void 0 ? void 0 : res.code;
                     const resId = yield this.resolve(filename, path_1.default.resolve(process.cwd(), 'package.json'));
@@ -178,7 +193,7 @@ function hmr(enableViteHmrForModes = ['development']) {
             });
         },
         transformIndexHtml(html) {
-            if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
+            if (process.env.EMBER_VITE_HMR_ENABLED !== 'true') {
                 return html;
             }
             const fullPath = '/@ember-vite-hmr/setup-ember-hmr.js';
@@ -234,20 +249,23 @@ function hmr(enableViteHmrForModes = ['development']) {
         },
         transform(source, id) {
             return __awaiter(this, void 0, void 0, function* () {
-                if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
+                if (process.env.EMBER_VITE_HMR_ENABLED !== 'true') {
                     return source;
                 }
                 const resourcePath = normalizePath(id.split('?')[0]);
                 const supportedExt = ['.hbs', '.gjs', 'gts', '.js', '.ts'];
-                if (!supportedExt.some(x => resourcePath.endsWith(x))) {
+                if (!supportedExt.some((x) => resourcePath.endsWith(x))) {
                     return source;
                 }
-                const name = require(`${process.cwd()}/package.json`).name;
+                const pkgPath = path_1.default.resolve(process.cwd(), 'package.json');
+                // eslint-disable-next-line @typescript-eslint/no-require-imports
+                const name = require(pkgPath).name;
                 if (resourcePath.includes(`${name}/app/app.js`)) {
                     source += `\n
               let prevCompatModules = Object.assign({}, compatModules);
               import.meta.hot.accept('@embroider/virtual/compat-modules', (m) => {
                 for (const [name, module] of Object.entries(m.default)) {
+                  compatModules[name] = module;
                   if (name.includes('initializers') && prevCompatModules[name]?.default !== module.default) {
                     globalThis.location.reload();
                   }
@@ -278,6 +296,7 @@ function hmr(enableViteHmrForModes = ['development']) {
                     let importVar = null;
                     let bindings = [];
                     const importStatements = [];
+                    // eslint-disable-next-line @typescript-eslint/no-require-imports
                     const traverse = require('@babel/traverse').default;
                     // First pass: Extract metadata
                     traverse(result, {
@@ -286,16 +305,20 @@ function hmr(enableViteHmrForModes = ['development']) {
                             const declaration = path.node.declaration;
                             // Check if this is: export const __hmr_import_metadata__ = {...}
                             if ((declaration === null || declaration === void 0 ? void 0 : declaration.type) === 'VariableDeclaration' &&
-                                ((_c = (_b = (_a = declaration.declarations) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.name) === '__hmr_import_metadata__') {
+                                ((_c = (_b = (_a = declaration.declarations) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.name) ===
+                                    '__hmr_import_metadata__') {
                                 const init = declaration.declarations[0].init;
                                 if ((init === null || init === void 0 ? void 0 : init.type) === 'ObjectExpression') {
                                     // Extract importVar and bindings from the object
                                     for (const prop of init.properties) {
-                                        if (prop.type === 'ObjectProperty' && prop.key.type === 'Identifier') {
-                                            if (prop.key.name === 'importVar' && prop.value.type === 'StringLiteral') {
+                                        if (prop.type === 'ObjectProperty' &&
+                                            prop.key.type === 'Identifier') {
+                                            if (prop.key.name === 'importVar' &&
+                                                prop.value.type === 'StringLiteral') {
                                                 importVar = prop.value.value;
                                             }
-                                            else if (prop.key.name === 'bindings' && prop.value.type === 'ArrayExpression') {
+                                            else if (prop.key.name === 'bindings' &&
+                                                prop.value.type === 'ArrayExpression') {
                                                 bindings = prop.value.elements
                                                     .filter((el) => (el === null || el === void 0 ? void 0 : el.type) === 'StringLiteral')
                                                     .map((el) => el.value);
@@ -310,6 +333,7 @@ function hmr(enableViteHmrForModes = ['development']) {
                     if (importVar && bindings.length > 0) {
                         traverse(result, {
                             ImportDeclaration(path) {
+                                var _a;
                                 const importSource = path.node.source.value;
                                 for (const specifier of path.node.specifiers) {
                                     const local = specifier.local.name;
@@ -320,7 +344,7 @@ function hmr(enableViteHmrForModes = ['development']) {
                                         }
                                         else if (specifier.type === 'ImportSpecifier') {
                                             // For named imports, use the imported name
-                                            specifierName = specifier.imported.name;
+                                            specifierName = ((_a = specifier.imported) === null || _a === void 0 ? void 0 : _a.name) || 'default';
                                         }
                                         else if (specifier.type === 'ImportNamespaceSpecifier') {
                                             specifierName = '*';
@@ -342,7 +366,8 @@ function hmr(enableViteHmrForModes = ['development']) {
                         for (const imp of importStatements) {
                             // Resolve the import to check if it's from node_modules
                             const resolved = yield this.resolve(imp.source, resourcePath, {});
-                            if ((resolved === null || resolved === void 0 ? void 0 : resolved.id) && normalizePath(resolved.id).includes('node_modules')) {
+                            if ((resolved === null || resolved === void 0 ? void 0 : resolved.id) &&
+                                normalizePath(resolved.id).includes('node_modules')) {
                                 // Skip node_modules imports
                                 continue;
                             }

package/dist/services/vite-hot-reload.js

@@ -23,7 +23,7 @@ function _initializerDefineProperty(e, i, r, l) {
 var _dec, _class, _descriptor;
 const ChangeMap = new WeakMap();
 function getLatestChange(obj) {
-  while (ChangeMap.has(obj)) {
+  while (obj && typeof obj === 'object' && ChangeMap.has(obj)) {
     obj = ChangeMap.get(obj);
   }
   return obj;
@@ -40,7 +40,8 @@ let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadServic
     globalThis.emberHotReloadPlugin.Resolver = app.Resolver;
     globalThis.emberHotReloadPlugin.modulePrefix = app.modulePrefix;
     globalThis.emberHotReloadPlugin.podModulePrefix = app.podModulePrefix;
-    this.router._router;
+    // Ensure router is initialized
+    void this.router._router;
     Object.defineProperty(this.router._router, '_routerMicrolib', {
       set(v) {
         const getRoute = v.getRoute;
@@ -55,8 +56,9 @@ let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadServic
         return this.___routerMicrolib;
       }
     });
-    this.container = getOwner(this)?.__container__;
-    globalThis.emberHotReloadPlugin.subscribe((oldModule, newModule) => {
+    const owner = getOwner(this);
+    this.container = owner?.__container__;
+    globalThis.emberHotReloadPlugin.subscribe((oldModule, _newModule) => {
       let changed = false;
       if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Route) {
         changed = true;
@@ -64,6 +66,9 @@ let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadServic
       if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Controller) {
         changed = true;
       }
+      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Service) {
+        changed = true;
+      }
       if (oldModule.id.startsWith('app/templates/') && !oldModule.id.startsWith('app/templates/components/')) {
         changed = true;
       }

package/dist/services/vite-hot-reload.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-hot-reload.js","sources":["../../src/services/vite-hot-reload.ts"],"sourcesContent":["import Service, { service } from '@ember/service';\nimport { getOwner } from '@ember/owner';\nimport RouterService from '@ember/routing/router-service';\nimport Router from '@ember/routing/route';\nimport Controller from '@ember/controller';\nimport ApplicationInstance from '@ember/application/instance';\n\nconst ChangeMap = new WeakMap();\n\nfunction getLatestChange(obj: any) {\n  while (ChangeMap.has(obj)) {\n    obj = ChangeMap.get(obj);\n  }\n  return obj;\n}\n\nexport default class ViteHotReloadService extends Service {\n  declare container: any;\n  @service() router!: RouterService;\n\n  init(args: any) {\n    super.init(args);\n    if (!globalThis.emberHotReloadPlugin) return;\n    const app = (getOwner(this) as ApplicationInstance)!.application as any;\n    globalThis.emberHotReloadPlugin.Resolver = app.Resolver;\n    globalThis.emberHotReloadPlugin.modulePrefix = app.modulePrefix;\n    globalThis.emberHotReloadPlugin.podModulePrefix = app.podModulePrefix;\n    this.router._router;\n    Object.defineProperty(this.router._router, '_routerMicrolib', {\n      set(v) {\n        const getRoute = v.getRoute;\n        v.getRoute = function (name: string) {\n          const route = getRoute.call(\n            this,\n            `${name}--hot-version--${globalThis.emberHotReloadPlugin.routerVersion}`,\n          );\n          route.fullRouteName = `${name}`.replace(\n            /--hot-version--.*$/,\n            '',\n          );\n          return route;\n        };\n        this.___routerMicrolib = v;\n      },\n      get() {\n        return this.___routerMicrolib;\n      },\n    });\n    this.container = (getOwner(this) as any)?.__container__;\n    globalThis.emberHotReloadPlugin.subscribe((oldModule: any, newModule: any) => {\n      let changed = false;\n      if (\n        oldModule.exports.default?.prototype &&\n        oldModule.exports.default.prototype instanceof Router\n      ) {\n        changed = true;\n      }\n      if (\n        oldModule.exports.default?.prototype &&\n        oldModule.exports.default.prototype instanceof Controller\n      ) {\n        changed = true;\n      }\n      if (\n        oldModule.id.startsWith('app/templates/') &&\n        !oldModule.id.startsWith('app/templates/components/')\n      ) {\n        changed = true;\n      }\n      if (oldModule.id.startsWith(`./${globalThis.emberHotReloadPlugin.podModulePrefix}/`)) {\n        changed = true;\n      }\n      if (!changed) return;\n      globalThis.emberHotReloadPlugin.routerVersion += 1;\n      const types = [\n        'route',\n        'controller',\n        'template',\n        'modifier',\n        'helper',\n        'component',\n      ];\n      Object.keys(this.container.cache).forEach((k) => {\n        if (types.some((t) => k.startsWith(`${t}:`))) {\n          delete this.container.cache[k];\n        }\n      });\n      Object.keys(this.container.factoryManagerCache || {}).forEach((k) => {\n        if (types.some((t) => k.startsWith(`${t}:`))) {\n          delete this.container.factoryManagerCache[k];\n        }\n      });\n      Object.keys(this.container.registry._resolveCache || {}).forEach((k) => {\n        if (types.some((t) => k.startsWith(`${t}:`))) {\n          delete this.container.registry._resolveCache[k];\n        }\n      });\n      Object.keys(this.container.validationCache || {}).forEach((k) => {\n        if (types.some((t) => k.startsWith(`${t}:`))) {\n          delete this.container.validationCache[k];\n        }\n      });\n      Object.keys(this.container.registry.registrations || {}).forEach((k) => {\n        if (types.some((t) => k.startsWith(`${t}:`))) {\n          delete this.container.registry.registrations[k];\n        }\n      });\n      if (\n        oldModule.exports.default?.prototype &&\n        oldModule.exports.default.prototype instanceof Router\n      ) {\n        this.router.refresh();\n      }\n      if (\n        oldModule.exports.default?.prototype &&\n        oldModule.exports.default.prototype instanceof Controller\n      ) {\n        this.router.refresh();\n      }\n      if (\n        oldModule.id.startsWith('app/templates/') &&\n        !oldModule.id.startsWith('app/templates/components/')\n      ) {\n        this.router.refresh();\n      }\n      if (oldModule.id.startsWith(`./${globalThis.emberHotReloadPlugin.podModulePrefix}/`)) {\n        this.router.refresh();\n      }\n    });\n  }\n  getLatestChange(obj: any) {\n    return getLatestChange(obj);\n  }\n}\n\n// Don't remove this declaration: this is what enables TypeScript to resolve\n// this service using `Owner.lookup('service:hot-reload')`, as well\n// as to check when you pass the service name as an argument to the decorator,\n// like `@service('hot-reload') declare altName: HotReloadService;`.\ndeclare module '@ember/service' {\n  interface Registry {\n    'hot-reload': ViteHotReloadService;\n  }\n}\n"],"names":["ChangeMap","WeakMap","getLatestChange","obj","has","get","ViteHotReloadService","_dec","service","_class","Service","constructor","args","_initializerDefineProperty","_descriptor","init","globalThis","emberHotReloadPlugin","app","getOwner","application","Resolver","modulePrefix","podModulePrefix","router","_router","Object","defineProperty","set","v","getRoute","name","route","call","routerVersion","fullRouteName","replace","___routerMicrolib","container","__container__","subscribe","oldModule","newModule","changed","exports","default","prototype","Router","Controller","id","startsWith","types","keys","cache","forEach","k","some","t","factoryManagerCache","registry","_resolveCache","validationCache","registrations","refresh","_applyDecoratedDescriptor","configurable","enumerable","writable","initializer"],"mappings":"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"}
+{"version":3,"file":"vite-hot-reload.js","sources":["../../src/services/vite-hot-reload.ts"],"sourcesContent":["import Service, { service } from '@ember/service';\nimport { getOwner } from '@ember/owner';\nimport RouterService from '@ember/routing/router-service';\nimport Router from '@ember/routing/route';\nimport Controller from '@ember/controller';\nimport ApplicationInstance from '@ember/application/instance';\n\nconst ChangeMap = new WeakMap<object, unknown>();\n\nfunction getLatestChange(obj: unknown) {\n  while (obj && typeof obj === 'object' && ChangeMap.has(obj)) {\n    obj = ChangeMap.get(obj);\n  }\n  return obj;\n}\n\nexport default class ViteHotReloadService extends Service {\n  declare container: {\n    cache: Record<string, unknown>;\n    factoryManagerCache: Record<string, unknown>;\n    registry: {\n      _resolveCache: Record<string, unknown>;\n      registrations: Record<string, unknown>;\n    };\n    validationCache: Record<string, unknown>;\n  };\n  @service() router!: RouterService;\n\n  init(args?: object) {\n    super.init(args);\n    if (!globalThis.emberHotReloadPlugin) return;\n    const app = (getOwner(this) as ApplicationInstance)!.application as unknown as {\n      Resolver: unknown;\n      modulePrefix: string;\n      podModulePrefix: string;\n    };\n    globalThis.emberHotReloadPlugin.Resolver = app.Resolver;\n    globalThis.emberHotReloadPlugin.modulePrefix = app.modulePrefix;\n    globalThis.emberHotReloadPlugin.podModulePrefix = app.podModulePrefix;\n    // Ensure router is initialized\n    void this.router._router;\n    Object.defineProperty(this.router._router, '_routerMicrolib', {\n      set(v) {\n        const getRoute = v.getRoute;\n        v.getRoute = function (name: string) {\n          const route = getRoute.call(\n            this,\n            `${name}--hot-version--${globalThis.emberHotReloadPlugin.routerVersion}`,\n          );\n          route.fullRouteName = `${name}`.replace(/--hot-version--.*$/, '');\n          return route;\n        };\n        this.___routerMicrolib = v;\n      },\n      get() {\n        return this.___routerMicrolib;\n      },\n    });\n    const owner = getOwner(this) as unknown as { __container__: ViteHotReloadService['container'] };\n    this.container = owner?.__container__;\n    globalThis.emberHotReloadPlugin.subscribe(\n      (\n        oldModule: {\n          exports: { default?: { prototype?: unknown } };\n          id: string;\n        },\n        _newModule: unknown,\n      ) => {\n        let changed = false;\n        if (\n          oldModule.exports.default?.prototype &&\n          oldModule.exports.default.prototype instanceof Router\n        ) {\n          changed = true;\n        }\n        if (\n          oldModule.exports.default?.prototype &&\n          oldModule.exports.default.prototype instanceof Controller\n        ) {\n          changed = true;\n        }\n        if (\n          oldModule.exports.default?.prototype &&\n          oldModule.exports.default.prototype instanceof Service\n        ) {\n          changed = true;\n        }\n        if (\n          oldModule.id.startsWith('app/templates/') &&\n          !oldModule.id.startsWith('app/templates/components/')\n        ) {\n          changed = true;\n        }\n        if (\n          oldModule.id.startsWith(\n            `./${globalThis.emberHotReloadPlugin.podModulePrefix}/`,\n          )\n        ) {\n          changed = true;\n        }\n        if (!changed) return;\n        globalThis.emberHotReloadPlugin.routerVersion += 1;\n        const types = [\n          'route',\n          'controller',\n          'template',\n          'modifier',\n          'helper',\n          'component',\n        ];\n        Object.keys(this.container.cache).forEach((k) => {\n          if (types.some((t) => k.startsWith(`${t}:`))) {\n            delete this.container.cache[k];\n          }\n        });\n        Object.keys(this.container.factoryManagerCache || {}).forEach((k) => {\n          if (types.some((t) => k.startsWith(`${t}:`))) {\n            delete this.container.factoryManagerCache[k];\n          }\n        });\n        Object.keys(this.container.registry._resolveCache || {}).forEach(\n          (k) => {\n            if (types.some((t) => k.startsWith(`${t}:`))) {\n              delete this.container.registry._resolveCache[k];\n            }\n          },\n        );\n        Object.keys(this.container.validationCache || {}).forEach((k) => {\n          if (types.some((t) => k.startsWith(`${t}:`))) {\n            delete this.container.validationCache[k];\n          }\n        });\n        Object.keys(this.container.registry.registrations || {}).forEach(\n          (k) => {\n            if (types.some((t) => k.startsWith(`${t}:`))) {\n              delete this.container.registry.registrations[k];\n            }\n          },\n        );\n        if (\n          oldModule.exports.default?.prototype &&\n          oldModule.exports.default.prototype instanceof Router\n        ) {\n          this.router.refresh();\n        }\n        if (\n          oldModule.exports.default?.prototype &&\n          oldModule.exports.default.prototype instanceof Controller\n        ) {\n          this.router.refresh();\n        }\n        if (\n          oldModule.id.startsWith('app/templates/') &&\n          !oldModule.id.startsWith('app/templates/components/')\n        ) {\n          this.router.refresh();\n        }\n        if (\n          oldModule.id.startsWith(\n            `./${globalThis.emberHotReloadPlugin.podModulePrefix}/`,\n          )\n        ) {\n          this.router.refresh();\n        }\n      },\n    );\n  }\n  getLatestChange(obj: unknown) {\n    return getLatestChange(obj);\n  }\n}\n\n// Don't remove this declaration: this is what enables TypeScript to resolve\n// this service using `Owner.lookup('service:hot-reload')`, as well\n// as to check when you pass the service name as an argument to the decorator,\n// like `@service('hot-reload') declare altName: HotReloadService;`.\ndeclare module '@ember/service' {\n  interface Registry {\n    'hot-reload': ViteHotReloadService;\n  }\n}\n"],"names":["ChangeMap","WeakMap","getLatestChange","obj","has","get","ViteHotReloadService","_dec","service","_class","Service","constructor","args","_initializerDefineProperty","_descriptor","init","globalThis","emberHotReloadPlugin","app","getOwner","application","Resolver","modulePrefix","podModulePrefix","router","_router","Object","defineProperty","set","v","getRoute","name","route","call","routerVersion","fullRouteName","replace","___routerMicrolib","owner","container","__container__","subscribe","oldModule","_newModule","changed","exports","default","prototype","Router","Controller","id","startsWith","types","keys","cache","forEach","k","some","t","factoryManagerCache","registry","_resolveCache","validationCache","registrations","refresh","_applyDecoratedDescriptor","configurable","enumerable","writable","initializer"],"mappings":"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"}

package/dist/setup-ember-hmr.js

@@ -1,5 +1,3 @@
-/// <reference types="../types/global" />
-
 if (import.meta.hot) {
   const ModuleMap = new Map();
   globalThis.emberHotReloadPlugin = {
@@ -24,7 +22,7 @@ if (import.meta.hot) {
     loadNew(oldModule, newModule) {
       ModuleMap.set(newModule.id, newModule);
       this.versionMap[newModule.id] = newModule.version;
-      const entry = Object.entries(this.Resolver.explicitModules).find(([name, module]) => module.default === oldModule.exports.default);
+      const entry = Object.entries(this.Resolver.explicitModules).find(([_name, module]) => module.default === oldModule.exports.default);
       if (!entry) return;
       this.Resolver.explicitModules[entry[0]] = newModule.exports;
     },
@@ -41,9 +39,9 @@ if (import.meta.hot) {
       };
       this._accepting -= 1;
       if (this._accepting === 0) {
-        setTimeout(() => this.notifyNew(), 0);
+        globalThis.setTimeout(() => this.notifyNew(), 0);
       }
-      let ok = module.id.includes('/routes/') || module.id.includes('/routers/') || module.id.includes('/controllers/') || module.id.includes('/templates/') || module.id.match(/controller\.(js|ts)$/) || module.id.match(/route\.(js|ts|gts)$/);
+      let ok = module.id.includes('/routes/') || module.id.includes('/routers/') || module.id.includes('/controllers/') || module.id.includes('/templates/') || module.id.includes('/services/') || module.id.match(/controller\.(js|ts)$/) || module.id.match(/route\.(js|ts|gts)$/);
       if (!ok) {
         return false;
       }

package/dist/setup-ember-hmr.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-ember-hmr.js","sources":["../src/setup-ember-hmr.ts"],"sourcesContent":["/// <reference types=\"../types/global\" />\n\nimport type { Module } from '../types/global';\n\nif (import.meta.hot) {\n    const ModuleMap = new Map();\n\n    globalThis.emberHotReloadPlugin = {\n        modulePrefix: '',\n        podModulePrefix: '',\n        Resolver: null,\n        _accepting: 0,\n        changed: {} as Record<string, { old: Module; new: Module }>,\n        subscribers: [],\n        version: 1,\n        routerVersion: 1,\n        moduleDepCallbacks: {},\n        versionMap: {},\n\n        clear(module: Module) {\n            this.moduleDepCallbacks[module.id] = {};\n        },\n        register(module: Module, dep: string, callback: Function) {\n            dep = dep.replace(new RegExp(`^${globalThis.emberHotReloadPlugin.modulePrefix}/`), './');\n            this.moduleDepCallbacks[module.id]![dep] =\n                this.moduleDepCallbacks[module.id]![dep] || ([] as Function[]);\n            this.moduleDepCallbacks[module.id]![dep]!.push(callback);\n        },\n        loadNew(oldModule: Module, newModule: Module) {\n            ModuleMap.set(newModule.id, newModule);\n            this.versionMap[newModule.id] = newModule.version;\n            const entry = Object.entries(\n                this.Resolver.explicitModules as Record<string, any>,\n            ).find(([name, module]) => module.default === oldModule.exports.default);\n            if (!entry) return;\n            this.Resolver.explicitModules[entry[0]] = newModule.exports;\n        },\n\n        __import(moduleUrl: string) {\n            return import(/* @vite-ignore */ moduleUrl);\n        },\n\n        async canAcceptNew(moduleUrl: string) {\n            this._accepting += 1;\n            const m = await this.__import(moduleUrl);\n            const module: Module = {\n                exports: m,\n                id: moduleUrl.split('?')[0]!.replace(/http:\\/\\/.*:[^\\/]*\\//, ''),\n                version: 0,\n            };\n            this._accepting -= 1;\n            if (this._accepting === 0) {\n                setTimeout(() => this.notifyNew(), 0);\n            }\n            let ok =\n                module.id.includes('/routes/') ||\n                module.id.includes('/routers/') ||\n                module.id.includes('/controllers/') ||\n                module.id.includes('/templates/') ||\n                module.id.match(/controller\\.(js|ts)$/) ||\n                module.id.match(/route\\.(js|ts|gts)$/);\n            if (!ok) {\n                return false;\n            }\n\n            if (module.id.includes('templates') && module.id.includes('components')) {\n                return false;\n            }\n\n            if (ModuleMap.get(module.id)) {\n                this.changed[module.id] = {\n                    old: ModuleMap.get(module.id),\n                    new: module,\n                };\n            } else {\n                ModuleMap.set(module.id, module);\n            }\n            module.version = this.version;\n            return true;\n        },\n        notifyNew() {\n            this.version += 1;\n            (Object.values(this.changed) as Array<{ old: Module; new: Module }>).forEach((change) => {\n                this.loadNew(change.old, change.new);\n                this.subscribers.forEach((fn: any) => fn(change.old, change.new));\n            });\n            this.changed = {};\n        },\n        subscribe(fn: (oldModule: Module, newModule: Module) => void) {\n            this.subscribers.push(fn);\n        },\n        unsubscribe(fn: (oldModule: Module, newModule: Module) => void) {\n            const idx = this.subscribers.indexOf(fn);\n            if (idx >= 0) {\n                this.subscribers.splice(idx, 1);\n            }\n        },\n    };\n}\n"],"names":["import","meta","hot","ModuleMap","Map","globalThis","emberHotReloadPlugin","modulePrefix","podModulePrefix","Resolver","_accepting","changed","subscribers","version","routerVersion","moduleDepCallbacks","versionMap","clear","module","id","register","dep","callback","replace","RegExp","push","loadNew","oldModule","newModule","set","entry","Object","entries","explicitModules","find","name","default","exports","__import","moduleUrl","canAcceptNew","m","split","setTimeout","notifyNew","ok","includes","match","get","old","new","values","forEach","change","fn","subscribe","unsubscribe","idx","indexOf","splice"],"mappings":"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"}
+{"version":3,"file":"setup-ember-hmr.js","sources":["../src/setup-ember-hmr.ts"],"sourcesContent":["import type { Module } from '../types/global';\n\nif (import.meta.hot) {\n  const ModuleMap = new Map();\n\n  globalThis.emberHotReloadPlugin = {\n    modulePrefix: '',\n    podModulePrefix: '',\n    Resolver: null,\n    _accepting: 0,\n    changed: {} as Record<string, { old: Module; new: Module }>,\n    subscribers: [],\n    version: 1,\n    routerVersion: 1,\n    moduleDepCallbacks: {},\n    versionMap: {},\n\n    clear(module: Module) {\n      this.moduleDepCallbacks[module.id] = {};\n    },\n    register(module: Module, dep: string, callback: () => void) {\n      dep = dep.replace(\n        new RegExp(`^${globalThis.emberHotReloadPlugin.modulePrefix}/`),\n        './',\n      );\n      this.moduleDepCallbacks[module.id]![dep] =\n        this.moduleDepCallbacks[module.id]![dep] || ([] as (() => void)[]);\n      this.moduleDepCallbacks[module.id]![dep]!.push(callback);\n    },\n    loadNew(oldModule: Module, newModule: Module) {\n      ModuleMap.set(newModule.id, newModule);\n      this.versionMap[newModule.id] = newModule.version;\n      const entry = Object.entries(\n        this.Resolver.explicitModules as Record<string, { default?: unknown }>,\n      ).find(([_name, module]) => module.default === oldModule.exports.default);\n      if (!entry) return;\n      this.Resolver.explicitModules[entry[0]] = newModule.exports;\n    },\n\n    __import(moduleUrl: string) {\n      return import(/* @vite-ignore */ moduleUrl);\n    },\n\n    async canAcceptNew(moduleUrl: string) {\n      this._accepting += 1;\n      const m = await this.__import(moduleUrl);\n      const module: Module = {\n        exports: m,\n        id: moduleUrl.split('?')[0]!.replace(/http:\\/\\/.*:[^\\/]*\\//, ''),\n        version: 0,\n      };\n      this._accepting -= 1;\n      if (this._accepting === 0) {\n        globalThis.setTimeout(() => this.notifyNew(), 0);\n      }\n      let ok =\n        module.id.includes('/routes/') ||\n        module.id.includes('/routers/') ||\n        module.id.includes('/controllers/') ||\n        module.id.includes('/templates/') ||\n        module.id.includes('/services/') ||\n        module.id.match(/controller\\.(js|ts)$/) ||\n        module.id.match(/route\\.(js|ts|gts)$/);\n      if (!ok) {\n        return false;\n      }\n\n      if (module.id.includes('templates') && module.id.includes('components')) {\n        return false;\n      }\n\n      if (ModuleMap.get(module.id)) {\n        this.changed[module.id] = {\n          old: ModuleMap.get(module.id),\n          new: module,\n        };\n      } else {\n        ModuleMap.set(module.id, module);\n      }\n      module.version = this.version;\n      return true;\n    },\n    notifyNew() {\n      this.version += 1;\n      (\n        Object.values(this.changed) as Array<{ old: Module; new: Module }>\n      ).forEach((change) => {\n        this.loadNew(change.old, change.new);\n        this.subscribers.forEach(\n          (fn: (oldModule: Module, newModule: Module) => void) =>\n            fn(change.old, change.new),\n        );\n      });\n      this.changed = {};\n    },\n    subscribe(fn: (oldModule: Module, newModule: Module) => void) {\n      this.subscribers.push(fn);\n    },\n    unsubscribe(fn: (oldModule: Module, newModule: Module) => void) {\n      const idx = this.subscribers.indexOf(fn);\n      if (idx >= 0) {\n        this.subscribers.splice(idx, 1);\n      }\n    },\n  };\n}\n"],"names":["import","meta","hot","ModuleMap","Map","globalThis","emberHotReloadPlugin","modulePrefix","podModulePrefix","Resolver","_accepting","changed","subscribers","version","routerVersion","moduleDepCallbacks","versionMap","clear","module","id","register","dep","callback","replace","RegExp","push","loadNew","oldModule","newModule","set","entry","Object","entries","explicitModules","find","_name","default","exports","__import","moduleUrl","canAcceptNew","m","split","setTimeout","notifyNew","ok","includes","match","get","old","new","values","forEach","change","fn","subscribe","unsubscribe","idx","indexOf","splice"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "2.0.7",
+  "version": "2.1.1",
   "keywords": [
     "ember-addon"
   ],
@@ -18,7 +18,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "concurrently 'pnpm:build:*'",
+    "build": "pnpm build:js && pnpm build:lib",
     "build:js": "rollup --config",
     "build:lib": "tsc --p tsconfig.lib.json",
     "watch:lib": "tsc --p tsconfig.lib.json --watch",
@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.28.5",
-    "@babel/plugin-transform-typescript": "^7.28.5",
-    "@babel/traverse": "^7.28.5",
+    "@babel/plugin-transform-typescript": "^7.28.6",
+    "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.28.5",
     "@embroider/addon-shim": "^1.10.2",
     "@glimmer/syntax": "^0.95.0",
@@ -49,17 +49,19 @@
     "babel-import-util": "^3.0.0",
     "babel-loader": "^10.1.1",
     "babel-preset-env": "^1.7.0",
-    "semver": "^7.7.3"
+    "semver": "^7.7.4"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.28.5",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-decorators": "^7.28.0",
-    "@babel/plugin-transform-class-static-block": "^7.28.3",
+    "@babel/plugin-transform-class-static-block": "^7.28.6",
     "@babel/runtime": "^7.28.4",
     "@embroider/addon-dev": "^8.3.0",
     "@embroider/compat": "^4.1.17",
     "@embroider/core": "^4.4.7",
+    "@eslint/js": "^9.39.4",
+    "@glimmer/component": "^2.0.0",
     "@glint/core": "^1.2.0",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
@@ -69,13 +71,15 @@
     "@types/babel__core": "^7.20.3",
     "@types/babel__traverse": "^7.28.0",
     "@types/csso": "^5.0.4",
-    "@types/debug": "^4.1.5",
+    "@types/debug": "^4.1.13",
     "@types/fs-extra": "^11.0.4",
-    "@types/lodash": "^4.17.21",
+    "@types/lodash": "^4.17.24",
     "@types/mini-css-extract-plugin": "^2.5.1",
     "@types/node": "^24.10.1",
     "@types/rsvp": "^4.0.9",
     "@types/semver": "^7.7.1",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
     "assert-never": "^1.4.0",
     "babel-import-util": "^3.0.0",
     "babel-plugin-ember-template-compilation": "^3.0.1",
@@ -84,22 +88,22 @@
     "ember-cli-htmlbars": "^6.3.0",
     "ember-resolver": "^13.1.1",
     "ember-source": "^6.12.0",
-    "@glimmer/component": "^2.0.0",
     "ember-template-lint": "^7.9.3",
-    "eslint": "^9.38.0",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-ember": "^12.7.5",
-    "eslint-plugin-n": "^17.23.1",
+    "eslint-plugin-n": "^17.24.0",
     "eslint-plugin-prettier": "^5.5.5",
     "execa": "^9.6.1",
     "fs-extra": "^11.3.2",
+    "globals": "^17.5.0",
     "playwright-chromium": "^1.59.1",
-    "prettier": "^3.8.1",
-    "prettier-plugin-ember-template-tag": "^2.1.2",
+    "prettier": "^3.8.3",
+    "prettier-plugin-ember-template-tag": "^2.1.3",
     "puppeteer-chromium-resolver": "^24.0.2",
     "rollup": "^4.53.3",
     "source-map-url": "^0.4.1",
-    "strip-ansi": "^7.1.2",
+    "strip-ansi": "^7.2.0",
     "style-loader": "^4.0.0",
     "supports-color": "^10.2.2",
     "terser": "^5.46.1",