ember-vite-hmr 1.5.3 → 1.5.5

package/README.md

@@ -24,9 +24,7 @@ update your `vite.config.mjs` with
 ```js
 import { hmr } from 'ember-vite-hmr';
 
-plugins: [
-  hmr()
-]
+plugins: [hmr()];
 ```
 
 update you `babel.config.cjs`

package/dist/lib/babel-plugin.js

@@ -111,11 +111,10 @@ class HotAstProcessor {
             };
         }
         const meta = this.meta;
-        const importVar = meta.importVar ||
-            env.meta.jsutils.bindExpression('null', null, {
-                nameHint: 'template__imports__',
-            });
-        meta.importVar = importVar;
+        const importVar = env.meta.jsutils.bindExpression(meta.importVar || 'null', null, {
+            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));

package/dist/lib/hmr.js

@@ -113,21 +113,9 @@ 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', 'templates'];
-                const supportedFileNames = [
-                    'route.js',
-                    'route.ts',
-                    'route.gts',
-                    'route.gjs',
-                    'controller.js',
-                    'controller.ts',
-                ];
-                if (resourcePath.includes('/-components/')) {
-                    return source;
-                }
                 let didReplaceSources = false;
                 const name = require(`${process.cwd()}/package.json`).name;
-                if (resourcePath.includes(`/assets/${name}.js`)) {
+                if (resourcePath.includes(`${name}/app/-embroider-entrypoint.js`)) {
                     const result = [...source.matchAll(/import \* as [^ ]+ from (.*);/g)];
                     source += result
                         .map((r) => {
@@ -138,10 +126,10 @@ function hmr(enableViteHmrForModes = ['development']) {
                     })
                         .join('');
                 }
-                if (resourcePath.endsWith('.hbs') ||
-                    resourcePath.endsWith('.gjs') ||
-                    resourcePath.endsWith('.gts') ||
-                    resourcePath.includes(`/assets/${name}.js`)) {
+                if (resourcePath.includes('ember-vite-hmr/virtual/components')) {
+                    return source;
+                }
+                if (!resourcePath.includes(`node_modules`)) {
                     const resolveDep = (dep) => __awaiter(this, void 0, void 0, function* () {
                         const resolved = yield this.resolve(dep, resourcePath, {});
                         let id = resolved === null || resolved === void 0 ? void 0 : resolved.id;
@@ -167,7 +155,7 @@ function hmr(enableViteHmrForModes = ['development']) {
                         return id;
                     });
                     const result = [
-                        ...source.matchAll(/import.meta.hot.accept\(\'([^']+)\'/g),
+                        ...source.matchAll(/import.meta.hot.accept\('([^']+)'/g),
                     ];
                     for (const resultElement of result) {
                         const dep = resultElement[1];
@@ -224,6 +212,18 @@ function hmr(enableViteHmrForModes = ['development']) {
                         ],
                     }).code;
                 }
+                const supportedPaths = ['routers', 'controllers', 'routes', 'templates'];
+                const supportedFileNames = [
+                    'route.js',
+                    'route.ts',
+                    'route.gts',
+                    'route.gjs',
+                    'controller.js',
+                    'controller.ts',
+                ];
+                if (resourcePath.includes('/-components/')) {
+                    return source;
+                }
                 if (!supportedPaths.some((s) => resourcePath.includes(`/${s}/`)) &&
                     !supportedFileNames.some((s) => resourcePath.endsWith(s))) {
                     return source;

package/package.json

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