ember-vite-hmr 2.2.1 → 2.2.3

package/dist/lib/babel-plugin.js

@@ -200,80 +200,71 @@ export default function hotReplaceAst(babel) {
                 const Service = util.import(programPath, '@ember/service', 'default');
                 const originalClassName = classIdentifier.name;
                 const proxyClassName = `${originalClassName}HmrProxy`;
-                const implVarName = `_${originalClassName}Impl`;
-                const proxyVarName = `_${originalClassName}Proxy`;
                 // Keep the original class as-is, just remove it from export
                 // We'll add it back as a non-exported class
+                const babelTemplate = babel.template;
+                // The live proxy instance and the latest accepted implementation must
+                // live on `import.meta.hot.data`, not in a module-scope `let`: Vite
+                // guarantees that object (and only that object) survives across a
+                // module's hot re-evaluations. A component's `@service` injection can
+                // end up constructing the proxy against a *later* re-evaluation of
+                // this module than the one whose `import.meta.hot.accept` closure
+                // captured a module-scope variable — the closure and the constructor
+                // would then silently operate on two disconnected variable bindings
+                // (a duplicate-module symptom), and the HMR swap would never reach
+                // the instance actually rendered.
+                const ctorBody = babelTemplate.statements(`
+            super(...args);
+            this._owner = args[0];
+            const Impl = (import.meta.hot && import.meta.hot.data._impl) || ${proxyClassName}.Impl;
+            this._delegate = new Impl(this._owner);
+            if (import.meta.hot) {
+              import.meta.hot.data._proxy = this;
+            }
+            return new Proxy(this, {
+              get(target, prop) {
+                if (prop === '_delegate') {
+                  return target._delegate;
+                }
+                return target._delegate[prop];
+              },
+              set(target, prop, value) {
+                target._delegate[prop] = value;
+                return true;
+              },
+            });
+          `)();
+                const willDestroyBody = babelTemplate.statements(`
+            super.willDestroy();
+            this._delegate.willDestroy();
+            if (import.meta.hot && import.meta.hot.data._proxy === this) {
+              import.meta.hot.data._proxy = undefined;
+            }
+          `)();
                 // Create the HMR proxy service class
                 const proxyClass = t.classDeclaration(t.identifier(proxyClassName), Service, t.classBody([
                     // static Impl = OriginalService (reference to the original class)
                     t.classProperty(t.identifier('Impl'), t.identifier(originalClassName), null, null, false, true),
                     // @tracked _delegate
                     t.classProperty(t.identifier('_delegate'), null, null, [t.decorator(tracked)], false, false),
-                    // constructor
-                    t.classMethod('constructor', t.identifier('constructor'), [t.restElement(t.identifier('args'))], t.blockStatement([
-                        t.expressionStatement(t.callExpression(t.super(), [
-                            t.spreadElement(t.identifier('args')),
-                        ])),
-                        // Store owner for HMR reloads
-                        t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('_owner')), t.memberExpression(t.identifier('args'), t.numericLiteral(0), true))),
-                        // Initialize delegate with owner
-                        t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('_delegate')), t.newExpression(t.identifier(implVarName), [
-                            t.memberExpression(t.thisExpression(), t.identifier('_owner'))
-                        ]))),
-                        t.ifStatement(t.unaryExpression('!', t.identifier(proxyVarName)), t.blockStatement([
-                            t.expressionStatement(t.assignmentExpression('=', t.identifier(proxyVarName), t.thisExpression())),
-                        ])),
-                        t.returnStatement(t.newExpression(t.identifier('Proxy'), [
-                            t.thisExpression(),
-                            t.objectExpression([
-                                t.objectMethod('method', t.identifier('get'), [t.identifier('target'), t.identifier('prop')], t.blockStatement([
-                                    t.ifStatement(t.binaryExpression('===', t.identifier('prop'), t.stringLiteral('_delegate')), t.returnStatement(t.memberExpression(t.identifier('target'), t.identifier('_delegate')))),
-                                    t.returnStatement(t.memberExpression(t.memberExpression(t.identifier('target'), t.identifier('_delegate')), t.identifier('prop'), true)),
-                                ])),
-                                t.objectMethod('method', t.identifier('set'), [
-                                    t.identifier('target'),
-                                    t.identifier('prop'),
-                                    t.identifier('value'),
-                                ], t.blockStatement([
-                                    t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.memberExpression(t.identifier('target'), t.identifier('_delegate')), t.identifier('prop'), true), t.identifier('value'))),
-                                    t.returnStatement(t.booleanLiteral(true)),
-                                ])),
-                            ]),
-                        ])),
-                    ])),
-                    // willDestroy
-                    t.classMethod('method', t.identifier('willDestroy'), [], t.blockStatement([
-                        t.expressionStatement(t.callExpression(t.memberExpression(t.super(), t.identifier('willDestroy')), [])),
-                        t.expressionStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('_delegate')), t.identifier('willDestroy')), [])),
-                    ])),
+                    t.classMethod('constructor', t.identifier('constructor'), [t.restElement(t.identifier('args'))], t.blockStatement(ctorBody)),
+                    t.classMethod('method', t.identifier('willDestroy'), [], t.blockStatement(willDestroyBody)),
                 ]));
-                // Create variable declarations with unique names to avoid conflicts
-                const currentImplDeclaration = t.variableDeclaration('let', [
-                    t.variableDeclarator(t.identifier(implVarName), t.identifier(originalClassName)),
-                ]);
-                const currentProxyDeclaration = t.variableDeclaration('let', [
-                    t.variableDeclarator(t.identifier(proxyVarName), t.nullLiteral()),
-                ]);
                 // For Case 1 (inline class), we need to keep the class as non-exported
                 // For Case 2 (separate declaration), the class already exists, so we don't recreate it
                 if (declaration.type === 'ClassDeclaration') {
                     // Case 1: Inline class export - create a non-exported version
                     const originalClass = t.classDeclaration(classIdentifier, classDeclaration.superClass, classDeclaration.body, classDeclaration.decorators || []);
                     // Replace the export with all the necessary declarations
-                    // IMPORTANT: Class must be declared BEFORE the variables that reference it
+                    // IMPORTANT: Class must be declared BEFORE the proxy class that references it
                     path.replaceWithMultiple([
                         originalClass, // The original class (no longer exported) - MUST BE FIRST
-                        currentImplDeclaration,
-                        currentProxyDeclaration,
                         t.exportDefaultDeclaration(proxyClass), // Export the proxy class
                     ]);
                 }
                 else {
                     // Case 2: Separate declaration - class already exists, just replace the export
                     path.replaceWithMultiple([
-                        currentImplDeclaration,
-                        currentProxyDeclaration,
                         t.exportDefaultDeclaration(proxyClass), // Export the proxy class
                     ]);
                 }
@@ -282,23 +273,28 @@ export default function hotReplaceAst(babel) {
                     const hmrCode = `
             if (import.meta.hot) {
               import.meta.hot.accept((newModule) => {
-                if (import.meta.hot.data._hotReload && newModule?.default?.Impl) {
-                  import.meta.hot.data._hotReload(newModule.default.Impl);
+                const NewImpl = newModule?.default?.Impl;
+                if (!NewImpl) {
+                  return;
                 }
-              });
-              
-              import.meta.hot.data._hotReload = import.meta.hot.data._hotReload || function(NewImpl) {
-                // Skip reload if no instance has been created yet
-                if (!${proxyVarName}) {
-                  ${implVarName} = NewImpl;
+
+                // Remember the latest accepted implementation so a proxy
+                // constructed *after* this update (its instantiation raced
+                // behind the HMR swap) still picks up the new class instead
+                // of the stale one captured at module-evaluation time.
+                import.meta.hot.data._impl = NewImpl;
+
+                const proxy = import.meta.hot.data._proxy;
+                if (!proxy) {
+                  // No instance has been created yet; the next construction
+                  // will read import.meta.hot.data._impl above.
                   return;
                 }
-                
-                const oldDelegate = ${proxyVarName}._delegate;
-                ${implVarName} = NewImpl;
-                const newDelegate = new ${implVarName}(${proxyVarName}._owner);
-                ${proxyVarName}._delegate = newDelegate;
-                
+
+                const oldDelegate = proxy._delegate;
+                const newDelegate = new NewImpl(proxy._owner);
+                proxy._delegate = newDelegate;
+
                 // Sync state from old to new while keeping new implementation defaults
                 for (const key in oldDelegate) {
                   const descriptor =
@@ -307,17 +303,17 @@ export default function hotReplaceAst(babel) {
                   const hasOwnDefault = Object.prototype.hasOwnProperty.call(newDelegate, key);
                   const currentValue = newDelegate[key];
                   const previousValue = oldDelegate[key];
-                  
+
                   // Skip Service instances - they should not be synced
                   if (previousValue instanceof Service) {
                     continue;
                   }
-                  
+
                   // Skip Function properties - they should not be synced
                   if (typeof previousValue === 'function') {
                     continue;
                   }
-                  
+
                   const shouldSync =
                     !!descriptor &&
                     (descriptor.writable || descriptor.set || Object.prototype.hasOwnProperty.call(oldDelegate, key)) &&
@@ -333,11 +329,11 @@ export default function hotReplaceAst(babel) {
                 }
 
                 newDelegate._hmrAccepted?.(oldDelegate);
-                
+
                 if (oldDelegate.willDestroy) {
                   oldDelegate.willDestroy();
                 }
-              };
+              });
             }
           `;
                     const template = babel.template.statements(hmrCode);

package/dist/lib/hmr.js

@@ -15,26 +15,51 @@ const traverse = traverseModule.default || traverseModule;
 import { readFile } from 'fs/promises';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+// Above this many distinct named blocks, fall back to forwarding all of them
+// unconditionally rather than generating an exponential number of branches
+// (see generateInvocations below for why branching is needed at all).
+const MAX_COMBINATORIAL_YIELDS = 8;
+function blockTag(y) {
+    return `<:${y} as |a b c d e f g h i j k l|>{{yield a b c d e f g h i j k l to='${y}'}}</:${y}>`;
+}
+function invocation(selected) {
+    if (!selected.length) {
+        return `<this.curried @__hot__={{this.hot}} ...attributes />`;
+    }
+    return `<this.curried @__hot__={{this.hot}} ...attributes>${selected.map(blockTag).join('\n')}</this.curried>`;
+}
+// Glimmer determines a target component's `(has-block "y")` purely from
+// whether a `<:y>` named block tag is structurally present on the
+// invocation, not from whether that block's content renders anything, and
+// named block tags cannot be nested inside `{{#if}}` (a "named block nested
+// in a normal block" compile error). So a per-block `{{#if (has-block 'y')}}
+// <:y>...</:y>{{/if}}` inside a single invocation can't work — instead this
+// recursively branches on `(has-block y)` for each known named block to
+// build one fully static invocation per combination of blocks the caller
+// actually passed, so blocks not passed are truly absent rather than merely
+// empty (see #531).
+function generateInvocations(remaining, selected) {
+    if (!remaining.length) {
+        return invocation(selected);
+    }
+    const [y, ...rest] = remaining;
+    return `{{#if (has-block '${y}')}}${generateInvocations(rest, [...selected, y])}{{else}}${generateInvocations(rest, selected)}{{/if}}`;
+}
 function generateContent(yields) {
     if (!yields.includes('default')) {
         yields.push('default');
     }
-    let all = yields.map((y) => `(has-block '${y}')`).join(' ');
-    let str = '';
-    for (const y of yields) {
-        str += `
-        <:${y} as |a b c d e f g h i j k l|>{{yield a b c d e f g h i j k l to='${y}'}}</:${y}>
-    `;
-    }
-    return `
+    if (yields.length > MAX_COMBINATORIAL_YIELDS) {
+        let all = yields.map((y) => `(has-block '${y}')`).join(' ');
+        return `
     {{#if (notAny ${all})}}
         <this.curried @__hot__={{this.hot}} ...attributes />
     {{else}}
-        <this.curried @__hot__={{this.hot}} ...attributes >
-        ${str}
-        </this.curried>
+        ${invocation(yields)}
     {{/if}}
   `;
+    }
+    return generateInvocations(yields, []);
 }
 const getHotComponent = (imp, specifier, yields) => `
 import { ${specifier} as TargetComponent } from "${imp}";
@@ -164,11 +189,15 @@ export function hmr(enableViteHmrForModes = ['development']) {
         name: 'hmr-plugin',
         enforce: 'post',
         config(_config, env) {
-            // The per-component hot wrapper (see getHotComponent) imports these, but
-            // it is generated/served on demand, so it is never part of the static
-            // module graph Vite's dependency scanner crawls on the first pass.
-            // Without pre-declaring them, the browser requests them on boot, Vite
-            // discovers "new" deps and triggers a re-optimize + full page reload.
+            // The per-component hot wrapper (see getHotComponent) imports the first
+            // four of these, but it is generated/served on demand, so it is never
+            // part of the static module graph Vite's dependency scanner crawls on
+            // the first pass. `@ember/component/template-only` has the same
+            // problem for a different reason: it's injected by the template
+            // compiler into a template-only component's compiled output, which the
+            // scanner (source-only) never sees either. Without pre-declaring them,
+            // the browser requests them on boot, Vite discovers "new" deps and
+            // triggers a re-optimize + full page reload.
             //
             // We must use the Embroider-rewritten `ember-source/...` subpaths: the
             // bare `@glimmer/reference` etc. specifiers the wrapper writes cannot be
@@ -185,6 +214,7 @@ export function hmr(enableViteHmrForModes = ['development']) {
                         'ember-source/@glimmer/runtime/index.js',
                         'ember-source/@ember/destroyable/index.js',
                         'ember-source/@glimmer/manager/index.js',
+                        'ember-source/@ember/component/template-only.js',
                     ],
                 },
             };
@@ -256,7 +286,16 @@ export function hmr(enableViteHmrForModes = ['development']) {
                     let yieldSourceContent = content;
                     const templateImportMatch = content === null || content === void 0 ? void 0 : content.match(/\bfrom\s*['"]([^'"]+\.hbs(?:\?[^'"]*)?)['"]/);
                     if (templateImportMatch) {
-                        const templateSpecifier = templateImportMatch[1];
+                        // The compiled backing class embeds the template import as a
+                        // browser-facing URL (i.e. prefixed with the configured vite
+                        // `base`), since that's what gets sent to the client. But
+                        // `server.transformRequest` is an internal API keyed by root-
+                        // relative ids, so the base has to be stripped back off before
+                        // reusing that specifier here, or this 404s under a non-root base.
+                        let templateSpecifier = templateImportMatch[1];
+                        if (base !== '/' && templateSpecifier.startsWith(base)) {
+                            templateSpecifier = `/${templateSpecifier.slice(base.length)}`;
+                        }
                         const templateRes = yield server.transformRequest(templateSpecifier);
                         yieldSourceFilename = templateSpecifier;
                         yieldSourceContent = templateRes === null || templateRes === void 0 ? void 0 : templateRes.code;
@@ -464,7 +503,17 @@ export function hmr(enableViteHmrForModes = ['development']) {
                             hotReloadStatements.push(`
   (async () => {
     const GlimmerComponent = (await import('@glimmer/component')).default;
-    if (${imp.local}.prototype instanceof GlimmerComponent) {
+    const { hasInternalComponentManager } = await import('@glimmer/manager');
+    // Class-based Glimmer components are functions, detected the cheap way
+    // via prototype chain. Template-only components (no backing class, e.g.
+    // a bare \`<template>\` export) are plain objects instead, so they have to
+    // be recognized by checking for a registered component manager - that
+    // also keeps helpers/modifiers (which use separate manager registries)
+    // out of this branch.
+    const isComponent = typeof ${imp.local} === 'function'
+      ? ${imp.local}.prototype instanceof GlimmerComponent
+      : typeof ${imp.local} === 'object' && ${imp.local} !== null && hasInternalComponentManager(${imp.local});
+    if (isComponent) {
       const c = await import('${virtualPath}');
       ${importVar}.${imp.local} = c.default;
       import.meta.hot.accept('${virtualPath}', (c) => {

package/dist/setup-ember-hmr.js

@@ -1,3 +1,7 @@
+// Matches the app/addon-relative portion of a path once it reaches one of
+// the directories ember-vite-hmr hot-reloads, e.g. the `app/templates/...`
+// in `/Users/me/project/app/templates/application.hbs`.
+const APP_RELATIVE_ID = /(?:^|\/)((?:app|addon)\/(?:routes?|routers|controllers|templates|services)\/.*)$/;
 function moduleIdFromUrl(moduleUrl) {
   let id = moduleUrl.split('?')[0];
   try {
@@ -12,7 +16,19 @@ function moduleIdFromUrl(moduleUrl) {
   if (base !== '/' && id.startsWith(base)) {
     id = id.slice(base.length);
   }
-  return id.replace(/^\//, '');
+  id = id.replace(/^\//, '');
+  // Outside of vite's own dev server (e.g. a Node ESM loader running the
+  // app directly against on-disk `file://` URLs, with no server `base` to
+  // strip) `id` is still the full OS path up to the project root instead
+  // of a server-relative one. Re-anchor it to the nearest hot-reloadable
+  // directory so consumers that key off ids like `app/templates/...`
+  // (ViteHotReloadService's `startsWith('app/templates/')` check) keep
+  // working no matter where the checkout lives on disk.
+  const rooted = id.match(APP_RELATIVE_ID);
+  if (rooted) {
+    id = rooted[1];
+  }
+  return id;
 }
 if (import.meta.hot) {
   const ModuleMap = new Map();
@@ -94,4 +110,6 @@ if (import.meta.hot) {
     }
   };
 }
+
+export { moduleIdFromUrl };
 //# sourceMappingURL=setup-ember-hmr.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"setup-ember-hmr.js","sources":["../src/setup-ember-hmr.ts"],"sourcesContent":["import type { Module } from '../types/global';\n\nfunction moduleIdFromUrl(moduleUrl: string) {\n  let id = moduleUrl.split('?')[0]!;\n  try {\n    // covers http/https and URLs without an explicit port\n    id = new URL(id).pathname;\n  } catch {\n    // not an absolute URL, keep as-is\n  }\n  // strip vite's `base` so ids are stable (`app/templates/...`) no matter\n  // what base the app is served under\n  const base = import.meta.env.BASE_URL || '/';\n  if (base !== '/' && id.startsWith(base)) {\n    id = id.slice(base.length);\n  }\n  return id.replace(/^\\//, '');\n}\n\nif (import.meta.hot) {\n  const ModuleMap = new Map();\n\n  globalThis.emberHotReloadPlugin = {\n    modulePrefix: '',\n    podModulePrefix: '',\n    Resolver: null,\n    _accepting: 0,\n    changed: {} as Record<string, { old: Module; new: Module }>,\n    subscribers: [],\n    version: 1,\n    routerVersion: 1,\n    moduleDepCallbacks: {},\n    versionMap: {},\n\n    clear(module: Module) {\n      this.moduleDepCallbacks[module.id] = {};\n    },\n    register(module: Module, dep: string, callback: () => void) {\n      dep = dep.replace(\n        new RegExp(`^${globalThis.emberHotReloadPlugin.modulePrefix}/`),\n        './',\n      );\n      this.moduleDepCallbacks[module.id]![dep] =\n        this.moduleDepCallbacks[module.id]![dep] || ([] as (() => void)[]);\n      this.moduleDepCallbacks[module.id]![dep]!.push(callback);\n    },\n    loadNew(oldModule: Module, newModule: Module) {\n      ModuleMap.set(newModule.id, newModule);\n      this.versionMap[newModule.id] = newModule.version;\n      const entry = Object.entries(\n        this.Resolver.explicitModules as Record<string, { default?: unknown }>,\n      ).find(([_name, module]) => module.default === oldModule.exports.default);\n      if (!entry) return;\n      this.Resolver.explicitModules[entry[0]] = newModule.exports;\n    },\n\n    __import(moduleUrl: string) {\n      return import(/* @vite-ignore */ moduleUrl);\n    },\n\n    async canAcceptNew(moduleUrl: string) {\n      this._accepting += 1;\n      const m = await this.__import(moduleUrl);\n      const module: Module = {\n        exports: m,\n        id: moduleIdFromUrl(moduleUrl),\n        version: 0,\n      };\n      this._accepting -= 1;\n      if (this._accepting === 0) {\n        globalThis.setTimeout(() => this.notifyNew(), 0);\n      }\n      let ok =\n        module.id.includes('/routes/') ||\n        module.id.includes('/routers/') ||\n        module.id.includes('/controllers/') ||\n        module.id.includes('/templates/') ||\n        module.id.includes('/services/') ||\n        module.id.match(/controller\\.(js|ts)$/) ||\n        module.id.match(/route\\.(js|ts|gts)$/);\n      if (!ok) {\n        return false;\n      }\n\n      if (module.id.includes('templates') && module.id.includes('components')) {\n        return false;\n      }\n\n      if (ModuleMap.get(module.id)) {\n        this.changed[module.id] = {\n          old: ModuleMap.get(module.id),\n          new: module,\n        };\n      } else {\n        ModuleMap.set(module.id, module);\n      }\n      module.version = this.version;\n      return true;\n    },\n    notifyNew() {\n      this.version += 1;\n      (\n        Object.values(this.changed) as Array<{ old: Module; new: Module }>\n      ).forEach((change) => {\n        this.loadNew(change.old, change.new);\n        this.subscribers.forEach(\n          (fn: (oldModule: Module, newModule: Module) => void) =>\n            fn(change.old, change.new),\n        );\n      });\n      this.changed = {};\n    },\n    subscribe(fn: (oldModule: Module, newModule: Module) => void) {\n      this.subscribers.push(fn);\n    },\n    unsubscribe(fn: (oldModule: Module, newModule: Module) => void) {\n      const idx = this.subscribers.indexOf(fn);\n      if (idx >= 0) {\n        this.subscribers.splice(idx, 1);\n      }\n    },\n  };\n}\n"],"names":["moduleIdFromUrl","moduleUrl","id","split","URL","pathname","base","import","meta","env","BASE_URL","startsWith","slice","length","replace","hot","ModuleMap","Map","globalThis","emberHotReloadPlugin","modulePrefix","podModulePrefix","Resolver","_accepting","changed","subscribers","version","routerVersion","moduleDepCallbacks","versionMap","clear","module","register","dep","callback","RegExp","push","loadNew","oldModule","newModule","set","entry","Object","entries","explicitModules","find","_name","default","exports","__import","canAcceptNew","m","setTimeout","notifyNew","ok","includes","match","get","old","new","values","forEach","change","fn","subscribe","unsubscribe","idx","indexOf","splice"],"mappings":"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"}
+{"version":3,"file":"setup-ember-hmr.js","sources":["../src/setup-ember-hmr.ts"],"sourcesContent":["import type { Module } from '../types/global';\n\n// Matches the app/addon-relative portion of a path once it reaches one of\n// the directories ember-vite-hmr hot-reloads, e.g. the `app/templates/...`\n// in `/Users/me/project/app/templates/application.hbs`.\nconst APP_RELATIVE_ID =\n  /(?:^|\\/)((?:app|addon)\\/(?:routes?|routers|controllers|templates|services)\\/.*)$/;\n\nexport function moduleIdFromUrl(moduleUrl: string) {\n  let id = moduleUrl.split('?')[0]!;\n  try {\n    // covers http/https and URLs without an explicit port\n    id = new URL(id).pathname;\n  } catch {\n    // not an absolute URL, keep as-is\n  }\n  // strip vite's `base` so ids are stable (`app/templates/...`) no matter\n  // what base the app is served under\n  const base = import.meta.env.BASE_URL || '/';\n  if (base !== '/' && id.startsWith(base)) {\n    id = id.slice(base.length);\n  }\n  id = id.replace(/^\\//, '');\n  // Outside of vite's own dev server (e.g. a Node ESM loader running the\n  // app directly against on-disk `file://` URLs, with no server `base` to\n  // strip) `id` is still the full OS path up to the project root instead\n  // of a server-relative one. Re-anchor it to the nearest hot-reloadable\n  // directory so consumers that key off ids like `app/templates/...`\n  // (ViteHotReloadService's `startsWith('app/templates/')` check) keep\n  // working no matter where the checkout lives on disk.\n  const rooted = id.match(APP_RELATIVE_ID);\n  if (rooted) {\n    id = rooted[1]!;\n  }\n  return id;\n}\n\nif (import.meta.hot) {\n  const ModuleMap = new Map();\n\n  globalThis.emberHotReloadPlugin = {\n    modulePrefix: '',\n    podModulePrefix: '',\n    Resolver: null,\n    _accepting: 0,\n    changed: {} as Record<string, { old: Module; new: Module }>,\n    subscribers: [],\n    version: 1,\n    routerVersion: 1,\n    moduleDepCallbacks: {},\n    versionMap: {},\n\n    clear(module: Module) {\n      this.moduleDepCallbacks[module.id] = {};\n    },\n    register(module: Module, dep: string, callback: () => void) {\n      dep = dep.replace(\n        new RegExp(`^${globalThis.emberHotReloadPlugin.modulePrefix}/`),\n        './',\n      );\n      this.moduleDepCallbacks[module.id]![dep] =\n        this.moduleDepCallbacks[module.id]![dep] || ([] as (() => void)[]);\n      this.moduleDepCallbacks[module.id]![dep]!.push(callback);\n    },\n    loadNew(oldModule: Module, newModule: Module) {\n      ModuleMap.set(newModule.id, newModule);\n      this.versionMap[newModule.id] = newModule.version;\n      const entry = Object.entries(\n        this.Resolver.explicitModules as Record<string, { default?: unknown }>,\n      ).find(([_name, module]) => module.default === oldModule.exports.default);\n      if (!entry) return;\n      this.Resolver.explicitModules[entry[0]] = newModule.exports;\n    },\n\n    __import(moduleUrl: string) {\n      return import(/* @vite-ignore */ moduleUrl);\n    },\n\n    async canAcceptNew(moduleUrl: string) {\n      this._accepting += 1;\n      const m = await this.__import(moduleUrl);\n      const module: Module = {\n        exports: m,\n        id: moduleIdFromUrl(moduleUrl),\n        version: 0,\n      };\n      this._accepting -= 1;\n      if (this._accepting === 0) {\n        globalThis.setTimeout(() => this.notifyNew(), 0);\n      }\n      let ok =\n        module.id.includes('/routes/') ||\n        module.id.includes('/routers/') ||\n        module.id.includes('/controllers/') ||\n        module.id.includes('/templates/') ||\n        module.id.includes('/services/') ||\n        module.id.match(/controller\\.(js|ts)$/) ||\n        module.id.match(/route\\.(js|ts|gts)$/);\n      if (!ok) {\n        return false;\n      }\n\n      if (module.id.includes('templates') && module.id.includes('components')) {\n        return false;\n      }\n\n      if (ModuleMap.get(module.id)) {\n        this.changed[module.id] = {\n          old: ModuleMap.get(module.id),\n          new: module,\n        };\n      } else {\n        ModuleMap.set(module.id, module);\n      }\n      module.version = this.version;\n      return true;\n    },\n    notifyNew() {\n      this.version += 1;\n      (\n        Object.values(this.changed) as Array<{ old: Module; new: Module }>\n      ).forEach((change) => {\n        this.loadNew(change.old, change.new);\n        this.subscribers.forEach(\n          (fn: (oldModule: Module, newModule: Module) => void) =>\n            fn(change.old, change.new),\n        );\n      });\n      this.changed = {};\n    },\n    subscribe(fn: (oldModule: Module, newModule: Module) => void) {\n      this.subscribers.push(fn);\n    },\n    unsubscribe(fn: (oldModule: Module, newModule: Module) => void) {\n      const idx = this.subscribers.indexOf(fn);\n      if (idx >= 0) {\n        this.subscribers.splice(idx, 1);\n      }\n    },\n  };\n}\n"],"names":["APP_RELATIVE_ID","moduleIdFromUrl","moduleUrl","id","split","URL","pathname","base","import","meta","env","BASE_URL","startsWith","slice","length","replace","rooted","match","hot","ModuleMap","Map","globalThis","emberHotReloadPlugin","modulePrefix","podModulePrefix","Resolver","_accepting","changed","subscribers","version","routerVersion","moduleDepCallbacks","versionMap","clear","module","register","dep","callback","RegExp","push","loadNew","oldModule","newModule","set","entry","Object","entries","explicitModules","find","_name","default","exports","__import","canAcceptNew","m","setTimeout","notifyNew","ok","includes","get","old","new","values","forEach","change","fn","subscribe","unsubscribe","idx","indexOf","splice"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "private": false,
   "description": "provides hmr support for ember apps",
   "keywords": [
@@ -83,7 +83,7 @@
     "content-tag": "^4.0.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-resolver": "^13.2.0",
-    "ember-source": "^7.0.0",
+    "ember-source": "^7.1.0",
     "ember-template-lint": "^7.9.3",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",