ember-vite-hmr 2.2.2 → 2.2.4

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}";
@@ -199,9 +224,11 @@ export function hmr(enableViteHmrForModes = ['development']) {
         },
         configResolved(config) {
             base = config.base;
-            process.env.EMBER_VITE_HMR_ENABLED = enableViteHmrForModes
-                .includes(config.mode)
-                .toString();
+            // `import.meta.hot` is never truthy without a dev server, so a `vite
+            // build` that resolves mode to 'development' would inject permanently
+            // dead HMR scaffolding and leave imported components bound to undefined.
+            process.env.EMBER_VITE_HMR_ENABLED = (config.command === 'serve' &&
+                enableViteHmrForModes.includes(config.mode)).toString();
         },
         resolveId(id, importer, meta) {
             return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vite-hmr",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "private": false,
   "description": "provides hmr support for ember apps",
   "keywords": [
@@ -38,7 +38,7 @@
     "@babel/core": "^7.29.0",
     "@babel/plugin-transform-typescript": "^7.28.6",
     "@babel/traverse": "^7.29.0",
-    "@babel/types": "^7.28.5",
+    "@babel/types": "^8.0.4",
     "@embroider/addon-shim": "^1.10.3",
     "@glimmer/syntax": "^0.95.0",
     "@types/supports-color": "^10.0.0",
@@ -61,7 +61,7 @@
     "@glint/core": "^1.2.0",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.7.3",
+    "@glint/template": "^1.7.10",
     "@rollup/plugin-babel": "^7.0.0",
     "@tsconfig/ember": "^3.0.12",
     "@types/babel__core": "^7.20.3",
@@ -74,7 +74,7 @@
     "@types/node": "^26.1.1",
     "@types/rsvp": "^4.0.9",
     "@types/semver": "^7.7.1",
-    "@typescript-eslint/eslint-plugin": "^8.61.1",
+    "@typescript-eslint/eslint-plugin": "^8.65.0",
     "@typescript-eslint/parser": "^8.65.0",
     "assert-never": "^1.4.0",
     "babel-import-util": "^3.0.0",
@@ -91,7 +91,7 @@
     "eslint-plugin-n": "^18.2.2",
     "eslint-plugin-prettier": "^5.5.5",
     "execa": "^9.6.1",
-    "fs-extra": "^11.3.6",
+    "fs-extra": "^11.4.0",
     "globals": "^17.7.0",
     "playwright-chromium": "^1.59.1",
     "prettier": "^3.8.4",
@@ -103,7 +103,7 @@
     "strip-ansi": "^7.2.0",
     "style-loader": "^4.0.0",
     "supports-color": "^10.2.2",
-    "terser": "^5.46.1",
+    "terser": "^5.49.0",
     "thread-loader": "^4.0.2",
     "typescript": "^5.9.3",
     "vite": "^8.0.16",