ember.nvp 1.15.0 → 1.17.0

package/.release-plan.json

@@ -2,13 +2,17 @@
   "solution": {
     "ember.nvp": {
       "impact": "minor",
-      "oldVersion": "1.14.0",
-      "newVersion": "1.15.0",
+      "oldVersion": "1.16.0",
+      "newVersion": "1.17.0",
       "tagName": "latest",
       "constraints": [
         {
           "impact": "minor",
           "reason": "Appears in changelog section :rocket: Enhancement"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
         }
       ],
       "pkgJSONPath": "./package.json"
@@ -17,11 +21,21 @@
       "oldVersion": "1.2.0"
     },
     "@nullvoxpopuli/ember-rolldown": {
-      "oldVersion": "2.10.0"
+      "impact": "minor",
+      "oldVersion": "2.11.0",
+      "newVersion": "2.12.0",
+      "tagName": "latest",
+      "constraints": [
+        {
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
+        }
+      ],
+      "pkgJSONPath": "./packages/rolldown/package.json"
     },
     "@nullvoxpopuli/ember-vite": {
-      "oldVersion": "1.2.0"
+      "oldVersion": "1.3.0"
     }
   },
-  "description": "## Release (2026-10-02)\n\n* ember.nvp 1.15.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#158](https://github.com/NullVoxPopuli/ember.nvp/pull/158) Migrate projects from the older blueprints ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### Committers: 1\n- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n"
+  "description": "## Release (2026-10-16)\n\n* ember.nvp 1.17.0 (minor)\n* @nullvoxpopuli/ember-rolldown 2.12.0 (minor)\n\n#### :rocket: Enhancement\n* `@nullvoxpopuli/ember-rolldown`, `ember.nvp`\n  * [#166](https://github.com/NullVoxPopuli/ember.nvp/pull/166) Require babel-plugin-ember-template-compilation 4.0.1 ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### :bug: Bug Fix\n* `ember.nvp`\n  * [#164](https://github.com/NullVoxPopuli/ember.nvp/pull/164) Add vite/client types to the dev tsconfig of libraries with tests ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### Committers: 1\n- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## Release (2026-10-16)
+
+* ember.nvp 1.17.0 (minor)
+* @nullvoxpopuli/ember-rolldown 2.12.0 (minor)
+
+#### :rocket: Enhancement
+* `@nullvoxpopuli/ember-rolldown`, `ember.nvp`
+  * [#166](https://github.com/NullVoxPopuli/ember.nvp/pull/166) Require babel-plugin-ember-template-compilation 4.0.1 ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+#### :bug: Bug Fix
+* `ember.nvp`
+  * [#164](https://github.com/NullVoxPopuli/ember.nvp/pull/164) Add vite/client types to the dev tsconfig of libraries with tests ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+#### Committers: 1
+- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+## Release (2026-10-12)
+
+* ember.nvp 1.16.0 (minor)
+* @nullvoxpopuli/ember-rolldown 2.11.0 (minor)
+* @nullvoxpopuli/ember-vite 1.3.0 (minor)
+
+#### :rocket: Enhancement
+* `@nullvoxpopuli/ember-rolldown`, `@nullvoxpopuli/ember-vite`, `ember.nvp`
+  * [#163](https://github.com/NullVoxPopuli/ember.nvp/pull/163) Update the embroider dependencies, give the config hook its plugin context ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+#### :bug: Bug Fix
+* `@nullvoxpopuli/ember-vite`, `ember.nvp`
+  * [#162](https://github.com/NullVoxPopuli/ember.nvp/pull/162) Find the embroider config plugin by name ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+* `@nullvoxpopuli/ember-rolldown`
+  * [#160](https://github.com/NullVoxPopuli/ember.nvp/pull/160) Fix macOS tests ([@tcjr](https://github.com/tcjr))
+
+#### Committers: 2
+- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+- Tom Carter ([@tcjr](https://github.com/tcjr))
+
 ## Release (2026-10-02)
 
 * ember.nvp 1.15.0 (minor)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "description": "ember project generator, alternative to the official blueprints, but more modern -- hopefully one day to upstream back in to ember-cli / official blueprints",
   "repository": {
     "type": "git",

package/packages/rolldown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nullvoxpopuli/ember-rolldown",
-  "version": "2.10.0",
+  "version": "2.12.0",
   "description": "Meta plugin for building ember v2 libraries/addons with rolldown & tsdown.",
   "type": "module",
   "main": "index.ts",
@@ -45,10 +45,10 @@
   "dependencies": {
     "@babel/core": "^7.28.10 || ^8.0.0",
     "@babel/plugin-transform-typescript": "^7.28.10 || ^8.0.0",
-    "@embroider/core": "^4.4.2",
+    "@embroider/core": "^4.6.9",
     "@jridgewell/remapping": "^2.3.5",
     "@nullvoxpopuli/ember-build-tooling-utils": "workspace:*",
-    "babel-plugin-ember-template-compilation": "^4.0.0",
+    "babel-plugin-ember-template-compilation": "^4.0.1",
     "content-tag": "^4.2.0",
     "decorator-transforms": "^2.4.0",
     "get-tsconfig": "^4.14.3",

package/packages/rolldown/src/transform.test.ts

@@ -1,6 +1,6 @@
 import { originalPositionFor, TraceMap } from "@jridgewell/trace-mapping";
 import { existsSync } from "node:fs";
-import { mkdtemp, mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdtemp, mkdir, readFile, realpath, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { rolldown } from "rolldown";
@@ -38,7 +38,7 @@ async function generate(
   files: Record<string, string>,
   { input = ["index.ts"], plugins = () => [], sourcemap = false }: BuildOptions = {},
 ): Promise<Build> {
-  const dir = await mkdtemp(path.join(tmpdir(), "ember-rolldown-build-"));
+  const dir = await realpath(await mkdtemp(path.join(tmpdir(), "ember-rolldown-build-")));
 
   for (const [relative, source] of Object.entries(files)) {
     const full = path.join(dir, relative);
@@ -347,7 +347,7 @@ describe("emberTransform (full plugin via rolldown)", () => {
   });
 
   it("emits sourcemaps for the specifier rewrite (no SOURCEMAP_BROKEN warnings)", async () => {
-    const dir = await mkdtemp(path.join(tmpdir(), "ember-rolldown-map-"));
+    const dir = await realpath(await mkdtemp(path.join(tmpdir(), "ember-rolldown-map-")));
 
     const files = {
       // index.ts contains a `.gts` specifier, so it goes through the rewrite.

package/packages/vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nullvoxpopuli/ember-vite",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Meta plugin for ember projects focusing on speed.",
   "type": "module",
   "main": "index.ts",
@@ -26,9 +26,9 @@
   "packageManager": "pnpm@10.28.0",
   "dependencies": {
     "@babel/core": "^7.28.10 || ^8.0.0",
-    "@embroider/core": "^4.4.2",
-    "@embroider/macros": "^1.20.3",
-    "@embroider/vite": "^1.5.0",
+    "@embroider/core": "^4.6.9",
+    "@embroider/macros": "^1.21.3",
+    "@embroider/vite": "^1.7.15",
     "@nullvoxpopuli/ember-build-tooling-utils": "workspace:*"
   },
   "engines": {

package/packages/vite/src/ember.test.ts

@@ -0,0 +1,38 @@
+import { extensions } from "@embroider/vite";
+import type { ConfigEnv, ConfigPluginContext } from "vite";
+import { describe, expect, it } from "vitest";
+
+import { ember } from "./ember.ts";
+
+const ROLLDOWN = { meta: { rolldownVersion: "1.0.0" } } as ConfigPluginContext;
+
+async function configure(env: ConfigEnv) {
+  const config: any = {};
+  const [plugin] = ember();
+
+  // @ts-expect-error the first entry is the config plugin
+  await plugin.config.call(ROLLDOWN, config, env);
+
+  return config;
+}
+
+describe("ember", () => {
+  /**
+   * These values come from the config hook of `@embroider/vite`.
+   * They are missing when that hook does not run.
+   */
+  it("applies the config from @embroider/vite", async () => {
+    const config = await configure({ command: "build", mode: "production" });
+
+    expect(config.resolve.extensions).toEqual(extensions);
+    expect(config.server.port).toBe(4200);
+    expect(config.optimizeDeps.exclude).toContain("@embroider/macros");
+  });
+
+  it("gives @embroider/vite the plugin context, so that it configures rolldown", async () => {
+    const config = await configure({ command: "build", mode: "production" });
+
+    expect(config.build.rolldownOptions.moduleTypes).toEqual({ ".ts": "js" });
+    expect(config.optimizeDeps.rolldownOptions.resolve.extensions).toEqual(extensions);
+  });
+});

package/packages/vite/src/ember.ts

@@ -2,13 +2,43 @@ import { buildMacros } from "@embroider/macros/babel";
 import { ember as embroiderEmber, extensions, resolver, templateTag } from "@embroider/vite";
 import { existsSync } from "node:fs";
 import { join, resolve } from "node:path";
-import type { ConfigEnv, ResolvedConfig } from "vite";
+import type { ConfigEnv, ConfigPluginContext, ResolvedConfig, UserConfig } from "vite";
 
 import { maybeBabel } from "@nullvoxpopuli/ember-build-tooling-utils";
 
 import { testHtml } from "./test-html.ts";
 
-const emberConfig = embroiderEmber()[3]!;
+const EMBER_CONFIG = "vite-plugin-ember-config";
+
+type ConfigHook = (
+  this: ConfigPluginContext,
+  config: UserConfig,
+  env: ConfigEnv,
+) => Promise<unknown> | unknown;
+
+/**
+ * `@embroider/vite` does not export its config hook on its own.
+ *
+ * The position of the plugin in the list changes between releases,
+ * so the name is the only stable way to find it.
+ */
+function findEmberConfig(): ConfigHook {
+  for (const plugin of embroiderEmber()) {
+    if (plugin.name !== EMBER_CONFIG) continue;
+
+    const hook = plugin.config;
+    const handler = typeof hook === "function" ? hook : hook?.handler;
+
+    if (handler) return handler as ConfigHook;
+  }
+
+  throw new Error(
+    `@embroider/vite has no "${EMBER_CONFIG}" plugin with a config hook. ` +
+      `This version of @embroider/vite is not supported by @nullvoxpopuli/ember-vite.`,
+  );
+}
+
+const emberConfig = findEmberConfig();
 
 const cwd = process.cwd();
 function absolutePath(relativePath: string) {
@@ -173,9 +203,12 @@ export function ember(nvpConfig: Config = {}) {
     {
       // no compat
       name: "ember:nullvoxpopuli",
-      async config(viteConfig: any, env: ConfigEnv) {
-        // @ts-expect-error it exists
-        await emberConfig.config(viteConfig, env);
+      async config(this: ConfigPluginContext, viteConfig: any, env: ConfigEnv) {
+        /**
+         * The hook reads the rolldown version from the plugin context,
+         * and takes its esbuild path without it.
+         */
+        await emberConfig.call(this, viteConfig, env);
 
         viteConfig.experimental ||= {};
         viteConfig.build ||= {};

package/src/bases/minimal-app/files/package.json

@@ -25,7 +25,7 @@
     "start": "vite"
   },
   "dependencies": {
-    "@embroider/macros": "^1.20.3",
+    "@embroider/macros": "^1.21.3",
     "@embroider/router": "^3.0.6",
     "@glimmer/component": "^2.1.1",
     "decorator-transforms": "^2.3.2",
@@ -37,14 +37,14 @@
     "@babel/plugin-transform-typescript": "^7.29.7",
     "@babel/runtime": "^7.29.7",
     "@ember/app-tsconfig": "^2.0.0",
-    "@embroider/core": "^4.4.2",
+    "@embroider/core": "^4.6.9",
     "@glint/ember-tsc": "^1.7.5",
     "@glint/template": "^1.7.7",
     "@glint/tsserver-plugin": "^2.5.5",
     "@nullvoxpopuli/ember-vite": "workspace:*",
     "@rollup/plugin-babel": "^7.1.0",
     "babel-plugin-debug-macros": "^2.0.0",
-    "babel-plugin-ember-template-compilation": "^4.0.0",
+    "babel-plugin-ember-template-compilation": "^4.0.1",
     "typescript": "^6.0.3",
     "vite": "^8.0.14"
   },

package/src/bases/minimal-extension/files/package.json

@@ -26,7 +26,7 @@
     "start": "vite"
   },
   "dependencies": {
-    "@embroider/macros": "^1.20.3",
+    "@embroider/macros": "^1.21.3",
     "@embroider/router": "^3.0.6",
     "@glimmer/component": "^2.1.1",
     "decorator-transforms": "^2.3.2",
@@ -38,14 +38,14 @@
     "@babel/plugin-transform-typescript": "^7.29.7",
     "@babel/runtime": "^7.29.7",
     "@ember/app-tsconfig": "^2.0.0",
-    "@embroider/core": "^4.4.2",
+    "@embroider/core": "^4.6.9",
     "@glint/ember-tsc": "^1.7.5",
     "@glint/template": "^1.7.7",
     "@glint/tsserver-plugin": "^2.5.5",
     "@nullvoxpopuli/ember-vite": "workspace:*",
     "@rollup/plugin-babel": "^7.1.0",
     "babel-plugin-debug-macros": "^2.0.0",
-    "babel-plugin-ember-template-compilation": "^4.0.0",
+    "babel-plugin-ember-template-compilation": "^4.0.1",
     "typescript": "^6.0.3",
     "vite": "^8.0.14"
   },

package/src/layers/qunit/index.js

@@ -29,9 +29,9 @@ const tsDeps = {
  */
 const libraryDeps = {
   ...deps,
-  "@embroider/macros": "^1.20.3",
+  "@embroider/macros": "^1.21.3",
   "@nullvoxpopuli/ember-vite": "workspace:*",
-  "babel-plugin-ember-template-compilation": "^4.0.0",
+  "babel-plugin-ember-template-compilation": "^4.0.1",
   vite: "^8.0.14",
 };
 const libraryTsDeps = {
@@ -223,7 +223,9 @@ async function syncTestBabelConfig(project, ts) {
  * Tests live outside `src`, and editors, `lint:types`, and eslint read tsconfig.json.
  * So in a TypeScript library, this layer:
  * - widens tsconfig.json to `src` and `tests`, without the publish-only settings
- * - moves those settings to `config/tsconfig.publish.json`, which the build uses
+ * - adds the `vite/client` types to tsconfig.json, because the tests build with Vite
+ * - moves the publish-only settings to `config/tsconfig.publish.json`, which the build uses.
+ *   That file keeps the library types, without `vite/client`, because `src` does not run through Vite.
  *
  * @param {import('#utils/project.js').Project} project
  */
@@ -233,18 +235,35 @@ async function usePublishTsconfig(project) {
 
   let config = await tsconfig.read(project.directory);
 
-  if (!needsWidening(config)) return;
+  if (needsWidening(config)) {
+    await tsconfig.modify((json) => {
+      json.include ||= [];
 
-  await tsconfig.modify((json) => {
-    json.include ||= [];
+      if (!json.include.includes("tests")) {
+        json.include.push("tests");
+      }
 
-    if (!json.include.includes("tests")) {
-      json.include.push("tests");
-    }
+      delete json.compilerOptions?.rootDir;
+      delete json.compilerOptions?.isolatedDeclarations;
+    }, project.directory);
+  }
 
-    delete json.compilerOptions?.rootDir;
-    delete json.compilerOptions?.isolatedDeclarations;
-  }, project.directory);
+  if (!hasViteTypes(config)) {
+    await tsconfig.modify((json) => {
+      json.compilerOptions ||= {};
+      json.compilerOptions.types ||= [];
+      json.compilerOptions.types.push(VITE_TYPES);
+    }, project.directory);
+  }
+}
+
+const VITE_TYPES = "vite/client";
+
+/**
+ * @param {Record<string, any>} config
+ */
+function hasViteTypes(config) {
+  return Boolean(config.compilerOptions?.types?.includes(VITE_TYPES));
 }
 
 /**

package/src/layers/qunit/library-ts-files/config/tsconfig.publish.json

@@ -3,6 +3,7 @@
   "include": ["../src"],
   "compilerOptions": {
     "rootDir": "../src",
-    "isolatedDeclarations": true
+    "isolatedDeclarations": true,
+    "types": ["ember-source/types", "@glint/ember-tsc/types"]
   }
 }

package/src/layers/vitest/index.js

@@ -23,7 +23,7 @@ const deps = {
 const libraryDeps = {
   "@babel/plugin-transform-typescript": "^7.28.10",
   "@nullvoxpopuli/ember-vite": "workspace:*",
-  "babel-plugin-ember-template-compilation": "^4.0.0",
+  "babel-plugin-ember-template-compilation": "^4.0.1",
   vite: "^8.0.14",
 };
 

package/test/ember.nvp/layer-qunit.test.ts

@@ -5,6 +5,7 @@ import { execa } from "execa";
 import { mkdir, rm, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 
+import { generateProject } from "ember.nvp";
 import type { Project } from "ember.nvp";
 
 async function installAndTest(project: Project) {
@@ -271,7 +272,8 @@ describe("layer: qunit", () => {
           "include": ["../src"],
           "compilerOptions": {
             "rootDir": "../src",
-            "isolatedDeclarations": true
+            "isolatedDeclarations": true,
+            "types": ["ember-source/types", "@glint/ember-tsc/types"]
           }
         }
         "
@@ -282,7 +284,7 @@ describe("layer: qunit", () => {
           "include": ["src", "tests"],
           "compilerOptions": {
             "lib": ["esnext", "dom", "dom.iterable"],
-            "types": ["ember-source/types", "@glint/ember-tsc/types"],
+            "types": ["ember-source/types", "@glint/ember-tsc/types", "vite/client"],
           },
           "contentMappers": [
             {
@@ -316,6 +318,31 @@ describe("layer: qunit", () => {
     });
   });
 
+  describe("library (TypeScript), updating a project from before vite/client", () => {
+    it("adds vite/client to tsconfig.json only", async () => {
+      const project = await generate({
+        type: "library",
+        name: "my-lib",
+        layers: ["qunit", "typescript"],
+      });
+      dirs.push(project.directory);
+
+      let tsconfig = await project.read("tsconfig.json");
+      expect(tsconfig).toContain(', "vite/client"');
+      await writeFile(
+        join(project.directory, "tsconfig.json"),
+        tsconfig!.replace(', "vite/client"', ""),
+      );
+
+      await generateProject(project, "update");
+
+      expect(await project.read("tsconfig.json")).toContain(
+        '"types": ["ember-source/types", "@glint/ember-tsc/types", "vite/client"]',
+      );
+      expect(await project.read("config/tsconfig.publish.json")).not.toContain("vite/client");
+    });
+  });
+
   describe("library (TypeScript) with eslint", () => {
     it("lints the tests", { timeout: 300_000 }, async () => {
       const project = await generate({

package/test/ember.nvp/publish-configs.test.ts

@@ -126,7 +126,7 @@ describe("publish configs", () => {
 
     manifest.devDependencies["@babel/core"] = "^7.28.10";
     manifest.devDependencies["@babel/plugin-transform-typescript"] = "^7.28.10";
-    manifest.devDependencies["babel-plugin-ember-template-compilation"] = "^4.0.0";
+    manifest.devDependencies["babel-plugin-ember-template-compilation"] = "^4.0.1";
 
     await writeFile(
       join(project.directory, "package.json"),