ember-vite-hmr 2.0.4 → 2.0.5

package/dist/lib/hmr.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hmr = hmr;
 const path_1 = __importDefault(require("path"));
 const core_1 = require("@babel/core");
-const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
 function generateContent(yields) {
     if (!yields.includes('default')) {
         yields.push('default');
@@ -124,6 +124,9 @@ function hmr(enableViteHmrForModes = ['development']) {
         },
         resolveId(id, importer, meta) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (id.includes('@ember-vite-hmr/setup-ember-hmr.js')) {
+                    return id;
+                }
                 if (importer === null || importer === void 0 ? void 0 : importer.startsWith(virtualPrefix)) {
                     importer = path_1.default.join(process.cwd(), 'package.json');
                     return this.resolve(id, importer, meta);
@@ -146,6 +149,9 @@ function hmr(enableViteHmrForModes = ['development']) {
         },
         load(id) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (id.includes('@ember-vite-hmr/setup-ember-hmr.js')) {
+                    return yield (0, promises_1.readFile)(path_1.default.resolve(__dirname, '..', 'setup-ember-hmr.js'), 'utf8');
+                }
                 if (id.startsWith(virtualPrefix)) {
                     if (!server) {
                         // During build, server is not available
@@ -175,8 +181,14 @@ function hmr(enableViteHmrForModes = ['development']) {
             if (process.env['EMBER_VITE_HMR_ENABLED'] !== 'true') {
                 return html;
             }
-            return (`<script type="module" src="/ember-vite-hmr/services/vite-hot-reload" />` +
-                html);
+            const fullPath = '/@ember-vite-hmr/setup-ember-hmr.js';
+            return [
+                {
+                    tag: 'script',
+                    attrs: { type: 'module' },
+                    children: `import "${fullPath}"`,
+                },
+            ];
         },
         handleHotUpdate(ctx) {
             if (!ctx.file.split('?')[0].endsWith('.hbs')) {
@@ -201,7 +213,7 @@ function hmr(enableViteHmrForModes = ['development']) {
             return __awaiter(this, void 0, void 0, function* () {
                 if (options.type === 'update' || options.type === 'create') {
                     const id = options.file;
-                    const source = (0, fs_1.readFileSync)(id).toString();
+                    const source = (yield (0, promises_1.readFile)(id)).toString();
                     if (cachedYields[id] &&
                         difference(cachedYields[id].yields, getYieldsFromFile(id, source, true).yields).length) {
                         for (const y of getYieldsFromFile(id, source).yields) {

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

@@ -29,86 +29,6 @@ function getLatestChange(obj) {
   }
   return obj;
 }
-let modulePrefix;
-let podModulePrefix;
-if (import.meta.hot) {
-  const ModuleMap = new Map();
-  window.emberHotReloadPlugin = {
-    Resolver: null,
-    _accepting: 0,
-    changed: {},
-    subscribers: [],
-    version: 1,
-    routerVersion: 1,
-    moduleDepCallbacks: {},
-    versionMap: {},
-    clear(module) {
-      this.moduleDepCallbacks[module.id] = {};
-    },
-    register(module, dep, callback) {
-      dep = dep.replace(new RegExp(`^${modulePrefix}/`), './');
-      this.moduleDepCallbacks[module.id][dep] = this.moduleDepCallbacks[module.id][dep] || [];
-      this.moduleDepCallbacks[module.id][dep].push(callback);
-    },
-    loadNew(oldModule, newModule) {
-      ModuleMap.set(newModule.id, newModule);
-      this.versionMap[newModule.id] = newModule.version;
-      const entry = Object.entries(this.Resolver.explicitModules).find(([name, module]) => module.default === oldModule.exports.default);
-      if (!entry) return;
-      this.Resolver.explicitModules[entry[0]] = newModule.exports;
-    },
-    __import(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].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.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),
-          new: module
-        };
-      } else {
-        ModuleMap.set(module.id, module);
-      }
-      module.version = this.version;
-      return true;
-    },
-    notifyNew() {
-      this.version += 1;
-      Object.values(this.changed).forEach(change => {
-        this.loadNew(change.old, change.new);
-        this.subscribers.forEach(fn => fn(change.old, change.new));
-      });
-      this.changed = {};
-    },
-    subscribe(fn) {
-      this.subscribers.push(fn);
-    },
-    unsubscribe(fn) {
-      const idx = this.subscribers.indexOf(fn);
-      if (idx >= 0) {
-        this.subscribers.splice(idx, 1);
-      }
-    }
-  };
-}
 let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadService extends Service {
   constructor(...args) {
     super(...args);
@@ -119,8 +39,8 @@ let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadServic
     if (!window.emberHotReloadPlugin) return;
     const app = getOwner(this).application;
     window.emberHotReloadPlugin.Resolver = app.Resolver;
-    modulePrefix = app.modulePrefix;
-    podModulePrefix = app.podModulePrefix;
+    window.emberHotReloadPlugin.modulePrefix = app.modulePrefix;
+    window.emberHotReloadPlugin.podModulePrefix = app.podModulePrefix;
     this.router._router;
     Object.defineProperty(this.router._router, '_routerMicrolib', {
       set(v) {
@@ -148,7 +68,7 @@ let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadServic
       if (oldModule.id.startsWith('app/templates/') && !oldModule.id.startsWith('app/templates/components/')) {
         changed = true;
       }
-      if (oldModule.id.startsWith(`./${podModulePrefix}/`)) {
+      if (oldModule.id.startsWith(`./${window.emberHotReloadPlugin.podModulePrefix}/`)) {
         changed = true;
       }
       if (!changed) return;
@@ -188,7 +108,7 @@ let ViteHotReloadService = (_dec = service(), _class = class ViteHotReloadServic
       if (oldModule.id.startsWith('app/templates/') && !oldModule.id.startsWith('app/templates/components/')) {
         this.router.refresh();
       }
-      if (oldModule.id.startsWith(`./${podModulePrefix}/`)) {
+      if (oldModule.id.startsWith(`./${window.emberHotReloadPlugin.podModulePrefix}/`)) {
         this.router.refresh();
       }
     });

package/dist/setup-ember-hmr.js

@@ -0,0 +1,82 @@
+
+if (import.meta.hot) {
+  const ModuleMap = new Map();
+  window.emberHotReloadPlugin = {
+    modulePrefix: '',
+    podModulePrefix: '',
+    Resolver: null,
+    _accepting: 0,
+    changed: {},
+    subscribers: [],
+    version: 1,
+    routerVersion: 1,
+    moduleDepCallbacks: {},
+    versionMap: {},
+    clear(module) {
+      this.moduleDepCallbacks[module.id] = {};
+    },
+    register(module, dep, callback) {
+      dep = dep.replace(new RegExp(`^${window.emberHotReloadPlugin.modulePrefix}/`), './');
+      this.moduleDepCallbacks[module.id][dep] = this.moduleDepCallbacks[module.id][dep] || [];
+      this.moduleDepCallbacks[module.id][dep].push(callback);
+    },
+    loadNew(oldModule, newModule) {
+      ModuleMap.set(newModule.id, newModule);
+      this.versionMap[newModule.id] = newModule.version;
+      const entry = Object.entries(this.Resolver.explicitModules).find(([name, module]) => module.default === oldModule.exports.default);
+      if (!entry) return;
+      this.Resolver.explicitModules[entry[0]] = newModule.exports;
+    },
+    __import(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].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.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),
+          new: module
+        };
+      } else {
+        ModuleMap.set(module.id, module);
+      }
+      module.version = this.version;
+      return true;
+    },
+    notifyNew() {
+      this.version += 1;
+      Object.values(this.changed).forEach(change => {
+        this.loadNew(change.old, change.new);
+        this.subscribers.forEach(fn => fn(change.old, change.new));
+      });
+      this.changed = {};
+    },
+    subscribe(fn) {
+      this.subscribers.push(fn);
+    },
+    unsubscribe(fn) {
+      const idx = this.subscribers.indexOf(fn);
+      if (idx >= 0) {
+        this.subscribers.splice(idx, 1);
+      }
+    }
+  };
+}
+//# sourceMappingURL=setup-ember-hmr.js.map

package/dist/setup-ember-hmr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-ember-hmr.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "keywords": [
     "ember-addon"
   ],
@@ -43,7 +43,7 @@
     "@babel/plugin-transform-typescript": "^7.28.5",
     "@babel/traverse": "^7.28.5",
     "@babel/types": "^7.28.5",
-    "@embroider/addon-shim": "^1.10.0",
+    "@embroider/addon-shim": "^1.10.2",
     "@glimmer/syntax": "^0.95.0",
     "@types/supports-color": "^10.0.0",
     "babel-import-util": "^3.0.0",
@@ -59,7 +59,7 @@
     "@babel/runtime": "^7.28.4",
     "@embroider/addon-dev": "^8.1.0",
     "@embroider/compat": "^4.1.8",
-    "@embroider/core": "^4.2.5",
+    "@embroider/core": "^4.2.7",
     "@glint/core": "^1.2.0",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
@@ -73,7 +73,7 @@
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.20",
     "@types/mini-css-extract-plugin": "^2.5.1",
-    "@types/node": "^24.10.0",
+    "@types/node": "^24.10.1",
     "@types/rsvp": "^4.0.9",
     "@types/semver": "^7.7.1",
     "assert-never": "^1.4.0",
@@ -97,16 +97,16 @@
     "prettier": "^3.6.2",
     "prettier-plugin-ember-template-tag": "^2.1.0",
     "puppeteer-chromium-resolver": "^24.0.2",
-    "rollup": "^4.52.5",
+    "rollup": "^4.53.2",
     "source-map-url": "^0.4.1",
     "strip-ansi": "^7.1.2",
     "style-loader": "^4.0.0",
     "supports-color": "^10.2.2",
-    "terser": "^5.44.0",
+    "terser": "^5.44.1",
     "thread-loader": "^4.0.2",
     "typescript": "^5.9.3",
-    "vite": "^7.2.0",
-    "vitest": "^4.0.7"
+    "vite": "^7.2.2",
+    "vitest": "^4.0.8"
   },
   "peerDependencies": {
     "@embroider/compat": "*",