ember-vite-hmr 0.6.2 → 0.6.4

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

@@ -9,17 +9,16 @@ declare class HotAstProcessor {
     };
     counter: number;
     meta: {
-        usedImports: any[];
+        usedImports: Set<unknown>;
         importVar: any;
     };
+    private usedImports;
     transform(env: ASTPluginEnvironment): {
         visitor: glimmer.NodeVisitor;
     };
-    buildVisitor({ importVar, imports, changes, hotReplaced, usedImports }: {
+    buildVisitor({ importVar, imports, usedImports }: {
         importVar: any;
         imports: any;
-        changes: any;
-        hotReplaced: any;
         usedImports: any;
     }): glimmer.NodeVisitor;
     replaceInAst(ast: glimmer.ASTv1.Template, importVar?: string, imports?: string[]): Set<unknown>;
@@ -28,5 +27,5 @@ declare class HotAstProcessor {
 export declare const hotAstProcessor: HotAstProcessor;
 export default function hotReplaceAst({ types: t }: {
     types: BabelTypes;
-}, options: any): PluginObj<import("@babel/core").PluginPass>;
+}): PluginObj<import("@babel/core").PluginPass>;
 export {};

package/dist/lib/babel-plugin.js

@@ -84,7 +84,7 @@ class HotAstProcessor {
         };
         this.counter = 0;
         this.meta = {
-            usedImports: [],
+            usedImports: new Set(),
             importVar: null,
         };
     }
@@ -109,12 +109,11 @@ class HotAstProcessor {
             visitor: this.buildVisitor({
                 importVar,
                 imports,
-                changes: [],
                 usedImports,
             }),
         };
     }
-    buildVisitor({ importVar, imports, changes, hotReplaced, usedImports }) {
+    buildVisitor({ importVar, imports, usedImports }) {
         const findBlockParams = function (expression, p) {
             if (p.node &&
                 p.node.type === 'BlockStatement' &&
@@ -136,15 +135,16 @@ class HotAstProcessor {
                     p.parentNode.params.includes(node)) {
                     return;
                 }
-                if (node.original === 'this')
+                const original = node.original.split('.')[0];
+                if (original === 'this')
                     return;
-                if (node.original.startsWith('@'))
+                if (original.startsWith('@'))
                     return;
-                if (node.original === 'block')
+                if (original === 'block')
                     return;
-                if (node.original.startsWith('this.'))
+                if (original.startsWith('this.'))
                     return;
-                if (findBlockParams(node.original.split('.')[0], p))
+                if (findBlockParams(original, p))
                     return;
                 const params = [];
                 const blockParams = [];
@@ -152,14 +152,14 @@ class HotAstProcessor {
                 if (node.original === 'helper' ||
                     node.original === 'component' ||
                     node.original === 'modifier') {
-                    if (p.parentNode.params[0].original &&
-                        findBlockParams(p.parentNode.params[0].original.split('.')[0], p))
+                    const original = p.parentNode.params[0].original.split('.')[0];
+                    if (original &&
+                        findBlockParams(original, p))
                         return;
-                    if (p.parentNode.params[0].original?.includes('.'))
+                    if (original?.includes('.'))
                         return;
-                    if (!p.parentNode.params[0].original)
+                    if (!original)
                         return;
-                    const original = p.parentNode.params[0].original;
                     const param = glimmer.builders.path(`${importVar}.${original}`);
                     p.parentNode.params.splice(0, 1);
                     p.parentNode.params.push(param);
@@ -169,7 +169,7 @@ class HotAstProcessor {
                 if (importVar) {
                     if (imports.includes(node.original)) {
                         usedImports.add(node.original);
-                        node.original = `${importVar}.${node.original}`;
+                        node.original = `${importVar}.${original}` + node.original.split('.').slice(1).join('.');
                         node.parts = node.original.split('.');
                     }
                     return;
@@ -205,23 +205,12 @@ class HotAstProcessor {
                 modifiers: {},
             },
         };
-        const changes = [];
         const visitor = this.buildVisitor({
             importVar,
             imports,
-            changes,
-            hotReplaced,
             usedImports,
         });
         glimmer.traverse(ast, visitor);
-        const program = ast;
-        let body = [...program.body];
-        for (const letBlock of changes) {
-            letBlock.program.body = body;
-            body = [letBlock];
-        }
-        program.body.length = 0;
-        program.body.push(...body);
         return usedImports;
     }
     processAst(contents, importVar, imports) {
@@ -232,7 +221,7 @@ class HotAstProcessor {
     }
 }
 exports.hotAstProcessor = new HotAstProcessor();
-function hotReplaceAst({ types: t }, options) {
+function hotReplaceAst({ types: t }) {
     let imports = [];
     let importMap = {};
     let tracked;
@@ -325,8 +314,6 @@ function hotReplaceAst({ types: t }, options) {
                     const hotAccepts = [];
                     for (const imp of [...usedImports]) {
                         const { source, specifiers } = importMap[imp];
-                        const i = t.importDeclaration([...specifiers], t.stringLiteral(source));
-                        node.body.splice(0, 0, i);
                         const specifier = specifiers.find((s) => s.local.name === imp);
                         const specifierName = specifier.imported?.name ||
                             specifier.imported?.value ||
@@ -377,6 +364,7 @@ function hotReplaceAst({ types: t }, options) {
                             const specifierName = specifier.imported?.name ||
                                 specifier.imported?.value ||
                                 'default';
+                            state.importUtil.import(path, source, specifierName);
                             const ast = (0, core_1.parse)(`import.meta.hot.accept('${source}', (module) => (${importVar.name}.${imp}=module['${specifierName}']))`);
                             const impHot = ast?.program.body[0];
                             hotAccepts.push(impHot);

package/dist/lib/hmr.d.ts

@@ -3,5 +3,6 @@ export declare function hmr(): {
     enforce: string;
     resolveId(id: any): any;
     transformIndexHtml(html: any): string;
+    handleHotUpdate(ctx: any): any;
     transform(source: any, id: any): Promise<any>;
 };

package/dist/lib/hmr.js

@@ -10,6 +10,9 @@ function hmr() {
         name: 'hmr-plugin',
         enforce: 'post',
         resolveId(id) {
+            if (id.startsWith('/@id/embroider_virtual:')) {
+                return this.resolve(id.replace('/@id/', ''), process.cwd());
+            }
             if (id === '/ember-vite-hmr/services/webpack-hot-reload') {
                 return this.resolve('ember-vite-hmr/services/webpack-hot-reload', process.cwd());
             }
@@ -18,6 +21,23 @@ function hmr() {
             return (`<script type="module" src="/ember-vite-hmr/services/webpack-hot-reload" />` +
                 html);
         },
+        handleHotUpdate(ctx) {
+            if (!ctx.file.split('?')[0].endsWith('.hbs')) {
+                return ctx.modules;
+            }
+            const otherModules = [];
+            const pairedModule = ctx.modules.find(m => [...m.importers].find(i => i.id.startsWith('embroider_virtual') && i.id.endsWith('-embroider-pair-component')));
+            if (pairedModule) {
+                const pairComponent = [...pairedModule.importers].find(i => i.id.startsWith('embroider_virtual') && i.id.endsWith('-embroider-pair-component'));
+                if (pairComponent) {
+                    const componentModule = [...pairComponent.clientImportedModules].find(cim => cim.id.split('?')[0].match(/\/component\.(js|ts|gjs|gts)/));
+                    if (componentModule) {
+                        otherModules.push(componentModule);
+                    }
+                }
+            }
+            return [...ctx.modules, ...otherModules];
+        },
         async transform(source, id) {
             const resourcePath = id.replace(/\\/g, '/').split('?')[0];
             const supportedPaths = ['routers', 'controllers', 'routes'];
@@ -32,18 +52,6 @@ function hmr() {
             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') ||
                 resourcePath.endsWith('.gts')) {
@@ -54,9 +62,12 @@ function hmr() {
                     const dep = resultElement[1];
                     const resolved = await this.resolve(dep, resourcePath, {});
                     let id = resolved.id;
-                    if (id.includes('rewritten-app')) {
+                    if (id.includes('rewritten-app') && !id.startsWith('embroider_virtual:')) {
                         id = id.split('rewritten-app')[1];
                     }
+                    if (id.startsWith('embroider_virtual:')) {
+                        id = '/@id/' + id;
+                    }
                     if (path_1.default.resolve(id).replace(/\\/g, '/') === id &&
                         path_1.default.isAbsolute(id)) {
                         if (!id.startsWith('/')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "keywords": [
     "ember-addon"
   ],
@@ -38,6 +38,8 @@
     "prepack": "pnpm build || echo 'its okay'"
   },
   "dependencies": {
+    "@babel/types": "^7.24.0",
+    "babel-import-util": "^2.0.1",
     "@glimmer/syntax": "^0.88.1",
     "@babel/core": "^7.23.2",
     "@babel/plugin-transform-typescript": "^7.22.15",