ember-vite-hmr 1.3.0 → 1.4.1

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

@@ -0,0 +1,34 @@
+import { PluginObj } from '@babel/core';
+import type * as BabelTypesNamespace from '@babel/types';
+import { Program } from '@babel/types';
+import * as glimmer from '@glimmer/syntax';
+export type BabelTypes = typeof BabelTypesNamespace;
+interface ASTPluginEnvironment {
+    locals: string[];
+}
+declare class HotAstProcessor {
+    options: {
+        itsStatic: boolean;
+    };
+    counter: number;
+    meta: {
+        locals: Set<string>;
+        importVar: any;
+        importBindings: Set<string>;
+        babelProgram: Program;
+    };
+    didCreateImportClass: boolean;
+    constructor();
+    reset(): void;
+    transform(env: ASTPluginEnvironment): any;
+    buildVisitor({ importVar, importBindings, babelProgram }: {
+        importVar: string;
+        importBindings: Set<string>;
+        babelProgram: Program;
+    }): glimmer.NodeVisitor;
+}
+export declare const hotAstProcessor: HotAstProcessor;
+export default function hotReplaceAst({ types: t }: {
+    types: BabelTypes;
+}): PluginObj<import("@babel/core").PluginPass>;
+export {};

package/dist/lib/babel-plugin.js

@@ -110,13 +110,11 @@ class HotAstProcessor {
             return meta.babelProgram.body.find(b => b.type === 'ImportDeclaration' && b.specifiers.some(s => s.local.name === specifier));
         };
         return {
-            visitor: {
-                ...this.buildVisitor({
-                    importVar,
-                    importBindings: meta.importBindings,
-                    babelProgram: meta.babelProgram
-                }),
-            },
+            visitor: Object.assign({}, this.buildVisitor({
+                importVar,
+                importBindings: meta.importBindings,
+                babelProgram: meta.babelProgram
+            })),
         };
     }
     buildVisitor({ importVar, importBindings, babelProgram }) {
@@ -248,6 +246,7 @@ function hotReplaceAst({ types: t }) {
                 }
                 const ifHot = t.ifStatement(t.memberExpression(t.metaProperty(t.identifier('import'), t.identifier('meta')), t.identifier('hot')), t.blockStatement([...hotAccepts]));
                 path.node.body.push(ifHot);
+                path.scope.crawl();
             }
         },
     };

package/dist/lib/hmr.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,56 +50,57 @@ function hmr(enableViteHmrForModes = ['development']) {
             }
             return [...ctx.modules, ...otherModules];
         },
-        async transform(source, id) {
-            const resourcePath = id.replace(/\\/g, '/').split('?')[0];
-            const supportedPaths = ['routers', 'controllers', 'routes'];
-            const supportedFileNames = [
-                'router.js',
-                'router.ts',
-                'router.gts',
-                'router.gjs',
-                'controller.js',
-                'controller.ts',
-            ];
-            if (resourcePath.includes('/-components/')) {
-                return source;
-            }
-            const name = require(`${process.cwd()}/package.json`).name;
-            if (resourcePath.includes(`/assets/${name}.js`)) {
-                source += `\nimport.meta.hot.accept();`;
-            }
-            if (resourcePath.endsWith('.hbs') ||
-                resourcePath.endsWith('.gjs') ||
-                resourcePath.endsWith('.gts')) {
-                const result = [
-                    ...source.matchAll(/import.meta.hot.accept\(\'([^']+)\'/g),
+        transform(source, id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const resourcePath = id.replace(/\\/g, '/').split('?')[0];
+                const supportedPaths = ['routers', 'controllers', 'routes'];
+                const supportedFileNames = [
+                    'router.js',
+                    'router.ts',
+                    'router.gts',
+                    'router.gjs',
+                    'controller.js',
+                    'controller.ts',
                 ];
-                for (const resultElement of result) {
-                    const dep = resultElement[1];
-                    const resolved = await this.resolve(dep, resourcePath, {});
-                    let id = resolved.id;
-                    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('/')) {
-                            id = '/' + id;
+                if (resourcePath.includes('/-components/')) {
+                    return source;
+                }
+                const name = require(`${process.cwd()}/package.json`).name;
+                if (resourcePath.includes(`/assets/${name}.js`)) {
+                    source += `\nimport.meta.hot.accept();`;
+                }
+                if (resourcePath.endsWith('.hbs') ||
+                    resourcePath.endsWith('.gjs') ||
+                    resourcePath.endsWith('.gts')) {
+                    const result = [
+                        ...source.matchAll(/import.meta.hot.accept\(\'([^']+)\'/g),
+                    ];
+                    for (const resultElement of result) {
+                        const dep = resultElement[1];
+                        const resolved = yield this.resolve(dep, resourcePath, {});
+                        let id = resolved.id;
+                        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('/')) {
+                                id = '/' + id;
+                            }
+                            id = '/@fs' + id;
                         }
-                        id = '/@fs' + id;
+                        source = source.replace(`import.meta.hot.accept('${dep}'`, `import.meta.hot.accept('${id}'`);
                     }
-                    source = source.replace(`import.meta.hot.accept('${dep}'`, `import.meta.hot.accept('${id}'`);
+                    return source;
                 }
-                return source;
-            }
-            if (!supportedPaths.some((s) => resourcePath.includes(`/${s}/`)) &&
-                !supportedFileNames.some((s) => resourcePath.endsWith(s))) {
-                return source;
-            }
-            return `${source}
+                if (!supportedPaths.some((s) => resourcePath.includes(`/${s}/`)) &&
+                    !supportedFileNames.some((s) => resourcePath.endsWith(s))) {
+                    return source;
+                }
+                return `${source}
   if (import.meta.hot && window.emberHotReloadPlugin) {
       const result = window.emberHotReloadPlugin.canAcceptNew(import.meta.url);
       result.then(() => {
@@ -102,6 +112,7 @@ function hmr(enableViteHmrForModes = ['development']) {
       });
   }
   `;
+            });
         },
     };
 }

package/package.json

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