fix

lib/babel-plugin.ts

@@ -407,7 +407,7 @@ export default function hotReplaceAst(
             ),
             t.blockStatement([assignment, ...hotAccepts]),
           );
-          node.body.splice(idx, 0, importsVar);
+          node.body.splice(0, 0, importsVar);
           node.body.push(ifHot);
         },
         exit(path, state) {
@@ -435,7 +435,7 @@ export default function hotReplaceAst(
           });
           const node = path.node;
           const usedImports = hotAstProcessor.meta.usedImports;
-          if (usedImports) {
+          if (usedImports || exports.hotAstProcessor.usedImports) {
             const lastImport = [...node.body]
               .reverse()
               .find((x) => x.type === 'ImportDeclaration');
@@ -444,7 +444,7 @@ export default function hotReplaceAst(
             node.body.splice(-1, 1);
             node.body.splice(idx, 0, assignment);
             const hotAccepts = [];
-            for (const imp of [...usedImports]) {
+            for (const imp of [...usedImports, ...exports.hotAstProcessor.meta.usedImports]) {
               const { source, specifiers } = importMap[imp];
               const specifier = specifiers.find((s) => s.local.name === imp);
               const specifierName =

lib/hmr.ts

@@ -29,6 +29,20 @@ export function hmr() {
         'controller.js',
         'controller.ts',
       ];
+      if (resourcePath.includes('/-components/')) {
+        return source;
+      }
+      const name =  require(`${process.cwd()}/package.json`).name;
+      if (resourcePath.includes(`/assets/${name}.js`)) {
+        const result = [
+          ...source.matchAll(/d\("([^"]+)"/g),
+        ];
+        for (const resultElement of result) {
+          const dep = resultElement[1];
+          if (!dep.includes('-components')) continue;
+          source += `\nimport.meta.hot.accept("${dep}", () => void);`
+        }
+      }
       if (
         resourcePath.endsWith('.hbs') ||
         resourcePath.endsWith('.gjs') ||

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "keywords": [
     "ember-addon"
   ],