ember-vite-hmr 1.4.17 → 1.5.0

package/README.md

@@ -29,6 +29,19 @@ plugins: [
 ]
 ```
 
+update you `babel.config.cjs`
+
+```js
+const { hotAstProcessor } = require('ember-vite-hmr/lib/babel-plugin');
+plugins: [['ember-vite-hmr/lib/babel-plugin'], ...other];
+```
+
+and for `'babel-plugin-ember-template-compilation'`
+
+```js
+transforms: [hotAstProcessor.transform, ...templateCompatSupport()],
+```
+
 ## Contributing
 
 See the [Contributing](CONTRIBUTING.md) guide for details.

package/addon-main.cjs

@@ -1,48 +1,4 @@
 'use strict';
 
 const { addonV1Shim } = require('@embroider/addon-shim');
-const path = require('path');
 module.exports = addonV1Shim(__dirname);
-const included = module.exports.included;
-
-Object.assign(module.exports, {
-  _getBabelOptions() {
-    const parentOptions = this.parent && this.parent.options;
-    const appOptions = this.app && this.app.options;
-    const addonOptions = parentOptions || appOptions || {};
-
-    addonOptions.babel = addonOptions.babel || {};
-    addonOptions.babel.plugins = addonOptions.babel.plugins || [];
-    return addonOptions.babel;
-  },
-  included(...args) {
-    this._getBabelOptions().plugins.push([
-      require.resolve('./dist/lib/babel-plugin.js'),
-      { v: 4, appName: this.app.name },
-    ]);
-    this._super.included; // need to access this somehow? otherwise it fails later on...
-
-    let astPlugin = this._buildPlugin();
-    astPlugin.parallelBabel = {
-      requireFile: __filename,
-      buildUsing: '_buildPlugin',
-      params: {},
-    };
-    const compatAppBuilder = require.resolve(
-      '@embroider/compat/src/compat-app-builder',
-      { paths: [process.cwd()] },
-    );
-    const CompatAppBuilder = require(compatAppBuilder).CompatAppBuilder;
-    const etcOptions = CompatAppBuilder.prototype.etcOptions;
-    CompatAppBuilder.prototype.etcOptions = async function (...args) {
-      const opts = await etcOptions.call(this, ...args);
-      opts.transforms.push(astPlugin);
-      return opts;
-    };
-    included.call(this, ...args);
-  },
-
-  _buildPlugin() {
-    return require('./dist/lib/babel-plugin').hotAstProcessor.transform;
-  },
-});

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

@@ -0,0 +1 @@
+export { default } from "ember-vite-hmr/instance-initializers/setup-hmr-manager";

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

@@ -0,0 +1,82 @@
+import Route from '@ember/routing/route';
+import Component from '@glimmer/component';
+import { getInternalComponentManager } from '@glimmer/manager';
+import '@glimmer/tracking';
+import '@glimmer/reference';
+import '@glimmer/runtime';
+
+function findPropertyDescriptor(component, key) {
+  let proto = component;
+  while (proto) {
+    const desc = Object.getOwnPropertyDescriptor(proto, key);
+    if (desc) return desc;
+    proto = Object.getPrototypeOf(proto);
+  }
+}
+function getState(component, skip) {
+  const state = {};
+  if (!component) {
+    return state;
+  }
+  for (const key in component) {
+    if (skip.includes(key)) continue;
+    const entry = findPropertyDescriptor(component, key);
+    if (entry) {
+      if (entry.writable && !Object.prototype.toString.call(entry.value).includes('Function')) {
+        state[key] = component[key];
+      }
+      if (entry.set) {
+        state[key] = component[key];
+      }
+    }
+  }
+  return state;
+}
+function syncState(instance) {
+  if (instance.args.__hot__) {
+    const state = instance.__get_hot_state__?.() || instance.args.__hot__.getState?.();
+    for (const k in state) {
+      instance[k] = state[k];
+    }
+    instance.args.__hot__.getState = () => getState(instance, ['args']);
+  }
+}
+function initialize() {
+  const ComponentManager = getInternalComponentManager(Component);
+  const proto = Object.getPrototypeOf(ComponentManager);
+  const create = proto.create;
+  proto.create = function (...args) {
+    const instance = create.call(this, ...args);
+    syncState(instance.component);
+    return instance;
+  };
+  const setupController = Route.prototype.setupController;
+  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] || {};
+    const skip = ['_qpDelegate', 'target', 'queryParams'];
+    const routerState = getState(state.router, skip);
+    const controllerState = getState(state.controller, skip);
+    for (const k in routerState) {
+      this[k] = routerState[k];
+    }
+    for (const k in controllerState) {
+      controller[k] = controllerState[k];
+    }
+    StateCache[fullRouteName] = {
+      route: this,
+      controller
+    };
+    return r;
+  };
+}
+var setupHmrManager = {
+  initialize
+};
+
+export { setupHmrManager as default, initialize };
+//# sourceMappingURL=setup-hmr-manager.js.map

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

@@ -0,0 +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 Component from '@glimmer/component';\n// @ts-ignore\nimport { getInternalComponentManager } from '@glimmer/manager';\n\n// vite dep optimizer is currently broken and cannot optimize new deps, need to include this ones from start\nimport { tracked } from '@glimmer/tracking';\n// @ts-ignore\nimport { createComputeRef } from '@glimmer/reference';\n// @ts-ignore\nimport { curry } from '@glimmer/runtime';\n\n(function () {\n  let run = false;\n  if (run) {\n    console.log(tracked, createComputeRef, curry);\n  }\n})();\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) {\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","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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"}

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":["import 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\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\n\nfunction supportErrorRecovery(appInstance: ApplicationInstance) {\n  const bodyHtml = window.document.body.cloneNode(true);\n  const renderer = appInstance.__container__.lookup('renderer:-dom') as Renderer;\n  const router = appInstance.__container__.lookup('service:router') 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('route:application') as any;\n    applicationRouter._router._toplevelView.destroy();\n    applicationRouter._router._toplevelView = null;\n    renderer._clearAllRoots();\n    window.document.body = bodyHtml.cloneNode(true) as any;\n    next(() => {\n      const transition = router.refresh();\n      applicationRouter.setup(applicationRouter.context, transition);\n    });\n  }\n  import.meta.hot?.on('vite:beforeUpdate', () => debounce(rerender, 100));\n  console.warn =  function (...args) {\n    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.')) {\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};\n"],"names":["patchResolver","application","__container__","lookup","resolver","__registry__","_fallback","fallback","resolverResolve","resolve","name","replace","call","supportErrorRecovery","appInstance","bodyHtml","window","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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"}
+{"version":3,"file":"vite-hot-reload.js","sources":["../../src/instance-initializers/vite-hot-reload.ts"],"sourcesContent":["import 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 = window.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._clearAllRoots();\n    window.document.body = bodyHtml.cloneNode(true) as any;\n    next(() => {\n      const transition = router.refresh();\n      applicationRouter.setup(applicationRouter.context, transition);\n    });\n  }\n  import.meta.hot?.on('vite:beforeUpdate', () => debounce(rerender, 100));\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};\n"],"names":["patchResolver","application","__container__","lookup","resolver","__registry__","_fallback","fallback","resolverResolve","resolve","name","replace","call","supportErrorRecovery","appInstance","bodyHtml","window","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

@@ -21,7 +21,7 @@ declare class HotAstProcessor {
     constructor();
     reset(): void;
     transform(env: ASTPluginEnvironment): any;
-    buildVisitor({ importVar, importBindings, babelProgram }: {
+    buildVisitor({ importVar, importBindings, babelProgram, }: {
         importVar: string;
         importBindings: Set<string>;
         babelProgram: Program;

package/dist/lib/babel-plugin.js

@@ -101,26 +101,31 @@ class HotAstProcessor {
     transform(env) {
         if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
             return {
-                visitor: {}
+                visitor: {},
             };
         }
         const meta = this.meta;
-        const importVar = meta.importVar || env.meta.jsutils.bindExpression('null', null, { nameHint: 'template__imports__' });
+        const importVar = meta.importVar ||
+            env.meta.jsutils.bindExpression('null', null, {
+                nameHint: 'template__imports__',
+            });
         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 meta.babelProgram.body.find((b) => b.type === 'ImportDeclaration' &&
+                b.specifiers.some((s) => s.local.name === specifier));
         };
         return {
             visitor: Object.assign({}, this.buildVisitor({
                 importVar,
                 importBindings: meta.importBindings,
-                babelProgram: meta.babelProgram
+                babelProgram: meta.babelProgram,
             })),
         };
     }
-    buildVisitor({ importVar, importBindings, babelProgram }) {
+    buildVisitor({ importVar, importBindings, babelProgram, }) {
         const findImport = function findImport(specifier) {
-            return babelProgram.body.find(b => b.type === 'ImportDeclaration' && b.specifiers.some(s => s.local.name === specifier));
+            return babelProgram.body.find((b) => b.type === 'ImportDeclaration' &&
+                b.specifiers.some((s) => s.local.name === specifier));
         };
         const findBlockParams = function (expression, p) {
             if (p.node.type === 'Template') {
@@ -161,14 +166,14 @@ 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') {
+                    if (typeof parent.params[0].original !==
+                        'string') {
                         return;
                     }
                     const original = parent.params[0].original.split('.')[0];
-                    if (original &&
-                        findBlockParams(original, p))
+                    if (original && findBlockParams(original, p))
                         return;
                     if (original === null || original === void 0 ? void 0 : original.includes('.'))
                         return;
@@ -228,20 +233,26 @@ function hotReplaceAst({ types: t }) {
                 }
                 const util = new babel_import_util_1.ImportUtil(t, path);
                 const tracked = util.import(path, '@glimmer/tracking', 'tracked');
+                const GlimmerComponent = 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) {
-                    klass.body.body.push(t.classProperty(t.identifier(local), t.identifier(local), null, [t.decorator(tracked)]));
+                    klass.body.body.push(t.classProperty(t.identifier(local), t.identifier(local), null, [
+                        t.decorator(tracked),
+                    ]));
                 }
                 const newExp = t.newExpression(klass, []);
                 const assign = t.assignmentExpression('=', t.identifier(exports.hotAstProcessor.meta.importVar), newExp);
-                const varDeclaration = path.node.body.findIndex((e) => e.type === 'VariableDeclaration' && e.declarations[0].id.name === exports.hotAstProcessor.meta.importVar) + 1;
+                const varDeclaration = path.node.body.findIndex((e) => e.type === 'VariableDeclaration' &&
+                    e.declarations[0].id.name ===
+                        exports.hotAstProcessor.meta.importVar) + 1;
                 const lastImportIndex = path.node.body.findLastIndex((e) => e.type === 'ImportDeclaration') + 1;
                 path.node.body.splice(Math.max(varDeclaration, lastImportIndex), 0, assign);
                 const findImport = function findImport(specifier) {
-                    return path.node.body.find(b => b.type === 'ImportDeclaration' && b.specifiers.some(s => s.local.name === specifier));
+                    return path.node.body.find((b) => b.type === 'ImportDeclaration' &&
+                        b.specifiers.some((s) => s.local.name === specifier));
                 };
-                const hotAccepts = [];
+                const ifHotStatements = [];
                 for (const imp of bindings) {
                     const importDeclaration = findImport(imp);
                     const source = importDeclaration.source.value;
@@ -249,14 +260,21 @@ function hotReplaceAst({ types: t }) {
                     const specifierName = ((_a = specifier.imported) === null || _a === void 0 ? void 0 : _a.name) ||
                         ((_b = specifier.imported) === null || _b === void 0 ? void 0 : _b.value) ||
                         'default';
-                    const ast = (0, core_1.parse)(`import.meta.hot.accept('${source}', (module) => (${exports.hotAstProcessor.meta.importVar}.${imp}=module['${specifierName}']))`);
-                    const impHot = ast === null || ast === void 0 ? void 0 : ast.program.body[0];
-                    hotAccepts.push(impHot);
+                    const ast = (0, core_1.parse)(`
+            (async () => {
+              const c = await import('ember-vite-hmr/virtual/component:${source}:${specifierName}.gjs');
+              ${exports.hotAstProcessor.meta.importVar}.${imp} = c.default;
+            })()
+            import.meta.hot.accept('${source}');
+          `);
+                    const importVirtual = ast === null || ast === void 0 ? void 0 : ast.program.body;
+                    const ifInstanceOfComponent = t.ifStatement(t.binaryExpression('instanceof', t.memberExpression(t.identifier(imp), t.identifier('prototype')), GlimmerComponent), t.blockStatement([...importVirtual]));
+                    ifHotStatements.push(ifInstanceOfComponent);
                 }
-                const ifHot = t.ifStatement(t.memberExpression(t.metaProperty(t.identifier('import'), t.identifier('meta')), t.identifier('hot')), t.blockStatement([...hotAccepts]));
+                const ifHot = t.ifStatement(t.memberExpression(t.metaProperty(t.identifier('import'), t.identifier('meta')), t.identifier('hot')), t.blockStatement([...ifHotStatements]));
                 path.node.body.push(ifHot);
                 path.scope.crawl();
-            }
+            },
         },
     };
 }

package/dist/lib/hmr.js

@@ -14,6 +14,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hmr = hmr;
 const path_1 = __importDefault(require("path"));
+const core_1 = require("@babel/core");
+const getHotComponent = (imp, specifier) => `
+import { ${specifier} as TargetComponent } from "${imp}";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { createComputeRef } from "@glimmer/reference";
+import { curry } from '@glimmer/runtime';
+import { CurriedTypes } from '@glimmer/vm';
+
+export default class HotComponent extends Component {
+  @tracked curried;
+  hot = {};
+  constructor(owner, args) {
+    super(owner, args);
+    const named = {};
+    const positional = [];
+    for (const name of Object.keys(args)) {
+      named[name] = createComputeRef(() => args[name]);
+    }
+    this.curried = curry(CurriedTypes.Component, TargetComponent, owner, { positional, named});
+    if (import.meta.hot) {
+      // Rehydrate any saved state
+      import.meta.hot.accept('${imp}', (module) => {
+        this.curried = curry(CurriedTypes.Component, module.default, owner, { positional, named});
+      })
+    }
+  }
+  <template>
+    <this.curried @__hot__={{this.hot}}></this.curried>
+  </template>
+}
+`;
+const virtualPrefix = 'ember-vite-hmr/virtual/component:';
 function hmr(enableViteHmrForModes = ['development']) {
     let conf;
     return {
@@ -25,14 +58,32 @@ function hmr(enableViteHmrForModes = ['development']) {
                 .includes(config.mode)
                 .toString();
         },
-        resolveId(id) {
+        resolveId(id, importer) {
+            if (importer.startsWith(virtualPrefix)) {
+                importer = path_1.default.join(process.cwd(), 'package.json');
+                return this.resolve(id, importer);
+            }
+            if (id.startsWith(virtualPrefix)) {
+                return id;
+            }
             if (id.startsWith('/@id/embroider_virtual:')) {
                 return this.resolve(id.replace('/@id/', ''), path_1.default.join(process.cwd(), 'package.json'));
             }
+            if (id.startsWith(`/@id/${virtualPrefix}`)) {
+                return this.resolve(id.replace('/@id/', ''), path_1.default.join(process.cwd(), 'package.json'));
+            }
             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'));
             }
         },
+        load(id) {
+            if (id.startsWith(virtualPrefix)) {
+                const [imp, specifier] = id
+                    .slice(virtualPrefix.length, -'.gts'.length)
+                    .split(':');
+                return getHotComponent(imp, specifier);
+            }
+        },
         transformIndexHtml(html) {
             if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
                 return html;
@@ -62,7 +113,7 @@ function hmr(enableViteHmrForModes = ['development']) {
         transform(source, id) {
             return __awaiter(this, void 0, void 0, function* () {
                 const resourcePath = id.replace(/\\/g, '/').split('?')[0];
-                const supportedPaths = ['routers', 'controllers', 'routes'];
+                const supportedPaths = ['routers', 'controllers', 'routes', 'templates'];
                 const supportedFileNames = [
                     'route.js',
                     'route.ts',
@@ -74,32 +125,30 @@ function hmr(enableViteHmrForModes = ['development']) {
                 if (resourcePath.includes('/-components/')) {
                     return source;
                 }
+                let didReplaceSources = false;
                 const name = require(`${process.cwd()}/package.json`).name;
                 if (resourcePath.includes(`/assets/${name}.js`)) {
-                    const result = [
-                        ...source.matchAll(/import \* as [^ ]+ from (.*);/g),
-                    ];
-                    source += result.map(r => {
+                    const result = [...source.matchAll(/import \* as [^ ]+ from (.*);/g)];
+                    source += result
+                        .map((r) => {
                         if (r[1].includes('initializers')) {
                             return `\nimport.meta.hot.accept(${r[1]}, () => window.location.reload());`;
                         }
                         return `\nimport.meta.hot.accept(${r[1]});`;
-                    }).join('');
+                    })
+                        .join('');
                 }
                 if (resourcePath.endsWith('.hbs') ||
                     resourcePath.endsWith('.gjs') ||
                     resourcePath.endsWith('.gts') ||
                     resourcePath.includes(`/assets/${name}.js`)) {
-                    const result = [
-                        ...source.matchAll(/import.meta.hot.accept\(\'([^']+)\'/g),
-                    ];
-                    for (const resultElement of result) {
-                        const dep = resultElement[1];
+                    const resolveDep = (dep) => __awaiter(this, void 0, void 0, function* () {
                         const resolved = yield this.resolve(dep, resourcePath, {});
-                        let id = resolved.id;
+                        let id = resolved === null || resolved === void 0 ? void 0 : resolved.id;
+                        if (!id)
+                            return;
                         let appRoot = conf.root + '/app/';
-                        if (id.startsWith(appRoot) &&
-                            !id.startsWith('embroider_virtual:')) {
+                        if (id.startsWith(appRoot) && !id.startsWith('embroider_virtual:')) {
                             id = 'app/' + id.split(appRoot)[1];
                         }
                         if (id.startsWith('embroider_virtual:')) {
@@ -112,13 +161,77 @@ function hmr(enableViteHmrForModes = ['development']) {
                             }
                             id = '/@fs' + id;
                         }
+                        if (!id.startsWith('/') && !id.startsWith('.')) {
+                            id = '/' + id;
+                        }
+                        return id;
+                    });
+                    const result = [
+                        ...source.matchAll(/import.meta.hot.accept\(\'([^']+)\'/g),
+                    ];
+                    for (const resultElement of result) {
+                        const dep = resultElement[1];
+                        const id = yield resolveDep(dep);
+                        if (!id)
+                            continue;
+                        if (dep === id)
+                            continue;
+                        didReplaceSources = true;
                         source = source.replace(`import.meta.hot.accept('${dep}'`, `import.meta.hot.accept('${id}'`);
                     }
+                    const importMatches = [...source.matchAll(/import\('([^']+)'/g)];
+                    for (const resultElement of importMatches) {
+                        const dep = resultElement[1];
+                        if (!dep.startsWith(virtualPrefix)) {
+                            continue;
+                        }
+                        const [imp, specifier] = dep
+                            .slice(virtualPrefix.length, -'.gts'.length)
+                            .split(':');
+                        const id = yield resolveDep(imp);
+                        if (!id)
+                            continue;
+                        if (dep === id)
+                            continue;
+                        didReplaceSources = true;
+                        source = source.replace(`import('${virtualPrefix}${imp}`, `import('${virtualPrefix}${id}`);
+                    }
+                }
+                if (didReplaceSources) {
+                    source = (0, core_1.transformSync)(source, {
+                        filename: id,
+                        babelrc: false,
+                        plugins: [
+                            {
+                                name: 'cleanup',
+                                visitor: {
+                                    CallExpression(path) {
+                                        var _a;
+                                        const node = path.node;
+                                        if (node.callee.type === 'Import' &&
+                                            ((_a = node.arguments[0]) === null || _a === void 0 ? void 0 : _a.type) === 'StringLiteral' &&
+                                            node.arguments[0].value.includes('ember-vite-hmr/virtual/component') &&
+                                            node.arguments[0].value.includes('node_modules')) {
+                                            let IfStatement = path;
+                                            while (IfStatement.type !== 'IfStatement') {
+                                                IfStatement = IfStatement.parentPath;
+                                            }
+                                            IfStatement.remove();
+                                        }
+                                    },
+                                },
+                            },
+                        ],
+                    }).code;
                 }
                 if (!supportedPaths.some((s) => resourcePath.includes(`/${s}/`)) &&
                     !supportedFileNames.some((s) => resourcePath.endsWith(s))) {
                     return source;
                 }
+                if (supportedPaths.includes('templates') &&
+                    supportedPaths.includes('components')) {
+                    return source;
+                }
                 return `${source}
   if (import.meta.hot && window.emberHotReloadPlugin) {
       const result = window.emberHotReloadPlugin.canAcceptNew(import.meta.url);

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

@@ -1,35 +1,23 @@
 import Service, { service } from '@ember/service';
 import { getOwner } from '@ember/owner';
-import Router from '@ember/routing/route';
+import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 
-function _initializerDefineProperty(target, property, descriptor, context) {
-  if (!descriptor) return;
-  Object.defineProperty(target, property, {
-    enumerable: descriptor.enumerable,
-    configurable: descriptor.configurable,
-    writable: descriptor.writable,
-    value: descriptor.initializer ? descriptor.initializer.call(context) : void 0
-  });
+function _applyDecoratedDescriptor(i, e, r, n, l) {
+  var a = {};
+  return Object.keys(n).forEach(function (i) {
+    a[i] = n[i];
+  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = !0), a = r.slice().reverse().reduce(function (r, n) {
+    return n(i, e, r) || r;
+  }, a), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
 }
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
-  var desc = {};
-  Object.keys(descriptor).forEach(function (key) {
-    desc[key] = descriptor[key];
+function _initializerDefineProperty(e, i, r, l) {
+  r && Object.defineProperty(e, i, {
+    enumerable: r.enumerable,
+    configurable: r.configurable,
+    writable: r.writable,
+    value: r.initializer ? r.initializer.call(l) : void 0
   });
-  desc.enumerable = !!desc.enumerable;
-  desc.configurable = !!desc.configurable;
-  if ('value' in desc || desc.initializer) {
-    desc.writable = true;
-  }
-  desc = decorators.slice().reverse().reduce(function (desc, decorator) {
-    return decorator(target, property, desc) || desc;
-  }, desc);
-  if (desc.initializer === void 0) {
-    Object.defineProperty(target, property, desc);
-    desc = null;
-  }
-  return desc;
 }
 
 var _dec, _class, _descriptor;
@@ -71,24 +59,27 @@ if (import.meta.hot) {
       };
     },
     __import(moduleUrl) {
-      return import( /* @vite-ignore */moduleUrl);
+      return import(/* @vite-ignore */moduleUrl);
     },
     async canAcceptNew(moduleUrl) {
       this._accepting += 1;
       const m = await this.__import(moduleUrl);
       const module = {
         exports: m,
-        id: moduleUrl.split('?')[0],
+        id: moduleUrl.split('?')[0].replace(/http:\/\/.*:[^\/]*\//, ''),
         version: 0
       };
       this._accepting -= 1;
       if (this._accepting === 0) {
         setTimeout(() => this.notifyNew(), 0);
       }
-      let ok = module.id.includes('/routes/') || module.id.includes('/routers/') || module.id.includes('/controllers/') || 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.match(/controller\.(js|ts)$/) || module.id.match(/route\.(js|ts|gts)$/);
       if (!ok) {
         return false;
       }
+      if (module.id.includes('templates') && module.id.includes('components')) {
+        return false;
+      }
       if (ModuleMap.get(module.id)) {
         this.changed[module.id] = {
           old: ModuleMap.get(module.id),
@@ -118,7 +109,7 @@ if (import.meta.hot) {
     }
   };
 }
-let ViteHotReloadService = (_dec = service(), (_class = class ViteHotReloadService extends Service {
+let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadService extends Service {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "router", _descriptor, this);
@@ -147,13 +138,13 @@ let ViteHotReloadService = (_dec = service(), (_class = class ViteHotReloadServi
     this.container = getOwner(this)?.__container__;
     window.emberHotReloadPlugin.subscribe((oldModule, newModule) => {
       let changed = false;
-      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Router) {
+      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Route) {
         changed = true;
       }
       if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Controller) {
         changed = true;
       }
-      if (oldModule.id.startsWith('./templates/') && !oldModule.id.startsWith('./templates/components/')) {
+      if (oldModule.id.startsWith('app/templates/') && !oldModule.id.startsWith('app/templates/components/')) {
         changed = true;
       }
       if (oldModule.id.startsWith(`./${podModulePrefix}/`)) {
@@ -187,13 +178,13 @@ let ViteHotReloadService = (_dec = service(), (_class = class ViteHotReloadServi
           delete this.container.registry.registrations[k];
         }
       });
-      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Router) {
+      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Route) {
         this.router.refresh();
       }
       if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Controller) {
         this.router.refresh();
       }
-      if (oldModule.id.startsWith('./templates/') && !oldModule.id.startsWith('./templates/components/')) {
+      if (oldModule.id.startsWith('app/templates/') && !oldModule.id.startsWith('app/templates/components/')) {
         this.router.refresh();
       }
       if (oldModule.id.startsWith(`./${podModulePrefix}/`)) {
@@ -204,12 +195,12 @@ let ViteHotReloadService = (_dec = service(), (_class = class ViteHotReloadServi
   getLatestChange(obj) {
     return getLatestChange(obj);
   }
-}, (_descriptor = _applyDecoratedDescriptor(_class.prototype, "router", [_dec], {
+}, _descriptor = _applyDecoratedDescriptor(_class.prototype, "router", [_dec], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class));
+}), _class);
 // this service using `Owner.lookup('service:hot-reload')`, as well
 // as to check when you pass the service name as an argument to the decorator,
 // like `@service('hot-reload') declare altName: HotReloadService;`.

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\nlet modulePrefix!: string;\nlet podModulePrefix!: string;\nif (import.meta.hot) {\n  const ModuleMap = new Map();\n\n  window.emberHotReloadPlugin = {\n    _accepting: 0,\n    changed: {},\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(`^${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      this.versionMap[newModule.id] = newModule.version;\n      const entry = Object.values(\n        requirejs.entries as Record<string, ReqJSEntry>,\n      ).find(\n        (module) => module.module.exports.default === oldModule.exports.default,\n      );\n      if (!entry) return;\n      entry.module = {\n        id: newModule.id,\n        exports: newModule.exports,\n        version: newModule.version,\n      };\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]!,\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.match(/controller\\.(js|ts)$/) ||\n        module.id.match(/route\\.(js|ts|gts)$/);\n      if (!ok) {\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      }\n      module.version = this.version;\n      ModuleMap.set(module.id, module);\n      return true;\n    },\n    notifyNew() {\n      this.version += 1;\n      Object.values(this.changed).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) {\n      this.subscribers.push(fn);\n    },\n    unsubscribe(fn) {\n      const idx = this.subscribers.indexOf(fn);\n      if (idx >= 0) {\n        this.subscribers.splice(idx, 1);\n      }\n    },\n  };\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 (!window.emberHotReloadPlugin) return;\n    const app = (getOwner(this) as ApplicationInstance)!.application as any;\n    modulePrefix = app.modulePrefix;\n    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--${window.emberHotReloadPlugin.routerVersion}`,\n          );\n          route.fullRouteName = `route:${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    window.emberHotReloadPlugin.subscribe((oldModule, newModule) => {\n      let changed = false;\n      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Router) {\n        changed = true;\n      }\n      if (oldModule.exports.default?.prototype && oldModule.exports.default.prototype instanceof Controller) {\n        changed = true;\n      }\n      if (oldModule.id.startsWith('./templates/') && !oldModule.id.startsWith('./templates/components/')) {\n        changed = true;\n      }\n      if (oldModule.id.startsWith(`./${podModulePrefix}/`)) {\n        changed = true;\n      }\n      if (!changed) return;\n      window.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('./templates/') &&\n        !oldModule.id.startsWith('./templates/components/')\n      ) {\n        this.router.refresh();\n      }\n      if (oldModule.id.startsWith(`./${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","modulePrefix","podModulePrefix","import","meta","hot","ModuleMap","Map","window","emberHotReloadPlugin","_accepting","changed","subscribers","version","routerVersion","moduleDepCallbacks","versionMap","clear","module","id","register","dep","callback","replace","RegExp","push","loadNew","oldModule","newModule","entry","Object","values","requirejs","entries","find","exports","default","__import","moduleUrl","canAcceptNew","m","split","setTimeout","notifyNew","ok","includes","match","old","new","set","forEach","change","fn","subscribe","unsubscribe","idx","indexOf","splice","ViteHotReloadService","_dec","service","_class","Service","constructor","args","_initializerDefineProperty","_descriptor","init","app","getOwner","application","router","_router","defineProperty","v","getRoute","name","route","call","fullRouteName","___routerMicrolib","container","__container__","prototype","Router","Controller","startsWith","types","keys","cache","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();\n\nfunction getLatestChange(obj: any) {\n  while (ChangeMap.has(obj)) {\n    obj = ChangeMap.get(obj);\n  }\n  return obj;\n}\n\nlet modulePrefix!: string;\nlet podModulePrefix!: string;\nif (import.meta.hot) {\n  const ModuleMap = new Map();\n\n  window.emberHotReloadPlugin = {\n    _accepting: 0,\n    changed: {},\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(`^${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      this.versionMap[newModule.id] = newModule.version;\n      const entry = Object.values(\n        requirejs.entries as Record<string, ReqJSEntry>,\n      ).find(\n        (module) => module.module.exports.default === oldModule.exports.default,\n      );\n      if (!entry) return;\n      entry.module = {\n        id: newModule.id,\n        exports: newModule.exports,\n        version: newModule.version,\n      };\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      }\n      module.version = this.version;\n      ModuleMap.set(module.id, module);\n      return true;\n    },\n    notifyNew() {\n      this.version += 1;\n      Object.values(this.changed).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) {\n      this.subscribers.push(fn);\n    },\n    unsubscribe(fn) {\n      const idx = this.subscribers.indexOf(fn);\n      if (idx >= 0) {\n        this.subscribers.splice(idx, 1);\n      }\n    },\n  };\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 (!window.emberHotReloadPlugin) return;\n    const app = (getOwner(this) as ApplicationInstance)!.application as any;\n    modulePrefix = app.modulePrefix;\n    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--${window.emberHotReloadPlugin.routerVersion}`,\n          );\n          route.fullRouteName = `route:${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    window.emberHotReloadPlugin.subscribe((oldModule, newModule) => {\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(`./${podModulePrefix}/`)) {\n        changed = true;\n      }\n      if (!changed) return;\n      window.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(`./${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","modulePrefix","podModulePrefix","import","meta","hot","ModuleMap","Map","window","emberHotReloadPlugin","_accepting","changed","subscribers","version","routerVersion","moduleDepCallbacks","versionMap","clear","module","id","register","dep","callback","replace","RegExp","push","loadNew","oldModule","newModule","entry","Object","values","requirejs","entries","find","exports","default","__import","moduleUrl","canAcceptNew","m","split","setTimeout","notifyNew","ok","includes","match","old","new","set","forEach","change","fn","subscribe","unsubscribe","idx","indexOf","splice","ViteHotReloadService","_dec","service","_class","Service","constructor","args","_initializerDefineProperty","_descriptor","init","app","getOwner","application","router","_router","defineProperty","v","getRoute","name","route","call","fullRouteName","___routerMicrolib","container","__container__","prototype","Router","Controller","startsWith","types","keys","cache","k","some","t","factoryManagerCache","registry","_resolveCache","validationCache","registrations","refresh","_applyDecoratedDescriptor","configurable","enumerable","writable","initializer"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "1.4.17",
+  "version": "1.5.0",
   "keywords": [
     "ember-addon"
   ],
@@ -34,7 +34,7 @@
     "start": "concurrently 'npm:start:*'",
     "start:js": "rollup --config --watch --no-watch.clearScreen",
     "start:types": "glint --declaration --watch",
-    "test": "vitest --run",
+    "test": "vitest run",
     "prepack": "pnpm build || echo 'its okay'"
   },
   "dependencies": {
@@ -42,7 +42,7 @@
     "@babel/plugin-transform-typescript": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.24.0",
-    "@embroider/addon-shim": "^1.0.0",
+    "@embroider/addon-shim": "^1.8.9",
     "@glimmer/syntax": "^0.88.1",
     "@types/supports-color": "^8.1.0",
     "babel-import-util": "^2.0.1",
@@ -51,16 +51,6 @@
     "semver": "^7.3.5"
   },
   "devDependencies": {
-    "assert-never": "^1.2.1",
-    "content-tag": "^2.0.1",
-    "source-map-url": "^0.4.1",
-    "style-loader": "^4.0.0",
-    "supports-color": "^9.4.0",
-    "terser": "^5.7.0",
-    "thread-loader": "^4.0.2",
-    "vite": "^5.2.11",
-    "vitest": "^2.0.5",
-    "ember-cli-htmlbars": "^6.3.0",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-decorators": "^7.23.2",
@@ -83,28 +73,44 @@
     "@types/lodash": "^4.14.170",
     "@types/mini-css-extract-plugin": "^2.5.1",
     "@types/node": "^20.14.10",
-    "@types/semver": "^7.3.6",
     "@types/rsvp": "^4.0.9",
-    "babel-plugin-ember-template-compilation": "^2.2.2",
+    "@types/semver": "^7.3.6",
+    "assert-never": "^1.2.1",
     "babel-import-util": "2.0.3",
+    "babel-plugin-ember-template-compilation": "^2.2.2",
     "concurrently": "^8.0.1",
+    "content-tag": "^2.0.1",
+    "ember-cli-htmlbars": "^6.3.0",
     "ember-resolver": "^11.0.1",
     "ember-source": "^5.10.1",
+    "@glimmer/component": "^1.1.2",
     "ember-template-lint": "^5.11.2",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-ember": "^12.2.0",
     "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-prettier": "^5.0.0",
+    "execa": "^9.3.1",
+    "fs-extra": "^11.2.0",
+    "playwright-chromium": "^1.47.0",
     "prettier": "^3.0.3",
     "prettier-plugin-ember-template-tag": "^2.0.2",
+    "puppeteer-chromium-resolver": "^23.0.0",
     "rollup": "^4.18.1",
-    "typescript": "^5.1.6"
+    "source-map-url": "^0.4.1",
+    "strip-ansi": "^7.1.0",
+    "style-loader": "^4.0.0",
+    "supports-color": "^9.4.0",
+    "terser": "^5.7.0",
+    "thread-loader": "^4.0.2",
+    "typescript": "^5.1.6",
+    "vite": "^5.2.11",
+    "vitest": "^2.0.5"
   },
   "peerDependencies": {
     "@embroider/compat": "*",
-    "babel-plugin-ember-template-compilation": "^2.2.2",
-    "babel-import-util": "2.0.3"
+    "babel-import-util": "2.0.3",
+    "babel-plugin-ember-template-compilation": "^2.2.2"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
@@ -117,6 +123,7 @@
     "type": "addon",
     "main": "addon-main.cjs",
     "app-js": {
+      "./instance-initializers/setup-hmr-manager.js": "./dist/_app_/instance-initializers/setup-hmr-manager.js",
       "./instance-initializers/vite-hot-reload.js": "./dist/_app_/instance-initializers/vite-hot-reload.js",
       "./services/vite-hot-reload.js": "./dist/_app_/services/vite-hot-reload.js"
     }