ember.nvp 1.16.0 → 1.17.1

package/.github/workflows/ci.yml

@@ -46,6 +46,7 @@ jobs:
             "@nullvoxpopuli/ember-rolldown>@babel/core": "^8.0.0"
             "@nullvoxpopuli/ember-rolldown>@babel/plugin-transform-typescript": "^8.0.0"
             "@nullvoxpopuli/ember-vite>@babel/core": "^8.0.0"
+            "@nullvoxpopuli/ember-vite>@babel/plugin-transform-typescript": "^8.0.0"
           EOF
       - run: pnpm install --no-frozen-lockfile
       - run: pnpm test:node packages/

package/.release-plan.json

@@ -1,18 +1,18 @@
 {
   "solution": {
     "ember.nvp": {
-      "impact": "minor",
-      "oldVersion": "1.15.0",
-      "newVersion": "1.16.0",
+      "impact": "patch",
+      "oldVersion": "1.17.0",
+      "newVersion": "1.17.1",
       "tagName": "latest",
       "constraints": [
         {
-          "impact": "minor",
-          "reason": "Appears in changelog section :rocket: Enhancement"
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
         },
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
       "pkgJSONPath": "./package.json"
@@ -21,32 +21,14 @@
       "oldVersion": "1.2.0"
     },
     "@nullvoxpopuli/ember-rolldown": {
-      "impact": "minor",
-      "oldVersion": "2.10.0",
-      "newVersion": "2.11.0",
-      "tagName": "latest",
-      "constraints": [
-        {
-          "impact": "minor",
-          "reason": "Appears in changelog section :rocket: Enhancement"
-        },
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "./packages/rolldown/package.json"
+      "oldVersion": "2.12.0"
     },
     "@nullvoxpopuli/ember-vite": {
-      "impact": "minor",
-      "oldVersion": "1.2.0",
-      "newVersion": "1.3.0",
+      "impact": "patch",
+      "oldVersion": "1.3.0",
+      "newVersion": "1.3.1",
       "tagName": "latest",
       "constraints": [
-        {
-          "impact": "minor",
-          "reason": "Appears in changelog section :rocket: Enhancement"
-        },
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
@@ -55,5 +37,5 @@
       "pkgJSONPath": "./packages/vite/package.json"
     }
   },
-  "description": "## Release (2026-10-12)\n\n* ember.nvp 1.16.0 (minor)\n* @nullvoxpopuli/ember-rolldown 2.11.0 (minor)\n* @nullvoxpopuli/ember-vite 1.3.0 (minor)\n\n#### :rocket: Enhancement\n* `@nullvoxpopuli/ember-rolldown`, `@nullvoxpopuli/ember-vite`, `ember.nvp`\n  * [#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))\n\n#### :bug: Bug Fix\n* `@nullvoxpopuli/ember-vite`, `ember.nvp`\n  * [#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))\n* `@nullvoxpopuli/ember-rolldown`\n  * [#160](https://github.com/NullVoxPopuli/ember.nvp/pull/160) Fix macOS tests ([@tcjr](https://github.com/tcjr))\n\n#### Committers: 2\n- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n- Tom Carter ([@tcjr](https://github.com/tcjr))\n"
+  "description": "## Release (2026-10-25)\n\n* ember.nvp 1.17.1 (patch)\n* @nullvoxpopuli/ember-vite 1.3.1 (patch)\n\n#### :bug: Bug Fix\n* `ember.nvp`, `@nullvoxpopuli/ember-vite`\n  * [#169](https://github.com/NullVoxPopuli/ember.nvp/pull/169) Take the macros development mode from the vite mode ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### :house: Internal\n* `ember.nvp`\n  * [#167](https://github.com/NullVoxPopuli/ember.nvp/pull/167) Expect rolldown 1.2.15 module comments in generated output ([@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,37 @@
 # Changelog
 
+## Release (2026-10-25)
+
+* ember.nvp 1.17.1 (patch)
+* @nullvoxpopuli/ember-vite 1.3.1 (patch)
+
+#### :bug: Bug Fix
+* `ember.nvp`, `@nullvoxpopuli/ember-vite`
+  * [#169](https://github.com/NullVoxPopuli/ember.nvp/pull/169) Take the macros development mode from the vite mode ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+#### :house: Internal
+* `ember.nvp`
+  * [#167](https://github.com/NullVoxPopuli/ember.nvp/pull/167) Expect rolldown 1.2.15 module comments in generated output ([@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-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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "1.16.0",
+  "version": "1.17.1",
   "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.11.0",
+  "version": "2.12.0",
   "description": "Meta plugin for building ember v2 libraries/addons with rolldown & tsdown.",
   "type": "module",
   "main": "index.ts",
@@ -48,7 +48,7 @@
     "@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/vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nullvoxpopuli/ember-vite",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Meta plugin for ember projects focusing on speed.",
   "type": "module",
   "main": "index.ts",
@@ -35,6 +35,9 @@
     "node": ">= 24"
   },
   "devDependencies": {
+    "@babel/plugin-transform-typescript": "^7.28.10 || ^8.0.0",
+    "babel-plugin-ember-template-compilation": "^4.0.1",
+    "decorator-transforms": "^2.4.0",
     "rolldown": "^1.1.2",
     "typescript": "^6.0.3",
     "vite": "^8.0.14"

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

@@ -1,6 +1,7 @@
 import { extensions } from "@embroider/vite";
-import type { ConfigEnv, ConfigPluginContext } from "vite";
-import { describe, expect, it } from "vitest";
+import { fileURLToPath } from "node:url";
+import type { ConfigEnv, ConfigPluginContext, Plugin } from "vite";
+import { afterEach, describe, expect, it } from "vitest";
 
 import { ember } from "./ember.ts";
 
@@ -36,3 +37,74 @@ describe("ember", () => {
     expect(config.optimizeDeps.rolldownOptions.resolve.extensions).toEqual(extensions);
   });
 });
+
+/**
+ * This package has no babel config,
+ * so `ember()` uses its default babel plugins,
+ * and babel resolves them from here.
+ */
+const PACKAGE_ROOT = fileURLToPath(new URL("..", import.meta.url));
+
+const DEV_CHECK = [
+  `import { isDevelopingApp, macroCondition } from "@embroider/macros";`,
+  `export const build = macroCondition(isDevelopingApp()) ? "development build" : "other build";`,
+].join("\n");
+
+const CONTEXT = {
+  error(error: unknown) {
+    throw error;
+  },
+};
+
+/**
+ * Runs the config hook, then the babel plugin, the way vite does.
+ */
+async function compile(mode: string) {
+  const plugins = ember() as Plugin[];
+  const config: any = {};
+
+  // @ts-expect-error the first entry is the config plugin
+  await plugins[0].config.call(ROLLDOWN, config, { command: "build", mode });
+
+  const babel = plugins.find((plugin) => plugin.name === "nullvoxpopuli:babel");
+  // @ts-expect-error the babel plugin has an object transform hook
+  const result = await babel.transform.handler.call(CONTEXT, DEV_CHECK, `${PACKAGE_ROOT}app.js`);
+
+  return result.code as string;
+}
+
+describe("default babel plugins", () => {
+  let restoreCwd: (() => void) | undefined;
+
+  afterEach(() => {
+    restoreCwd?.();
+    restoreCwd = undefined;
+  });
+
+  function inPackageRoot() {
+    const previous = process.cwd();
+    process.chdir(PACKAGE_ROOT);
+    restoreCwd = () => process.chdir(previous);
+  }
+
+  /**
+   * vite sets NODE_ENV from the mode only after the config hooks run.
+   * Under vitest, NODE_ENV is "test".
+   */
+  it("keeps development-only code in development mode", async () => {
+    inPackageRoot();
+
+    const code = await compile("development");
+
+    expect(code).toContain("development build");
+  });
+
+  it("removes development-only code in production mode", async () => {
+    inPackageRoot();
+
+    const code = await compile("production");
+
+    expect(code).not.toContain("development build");
+    expect(code).toContain("other build");
+  });
+});

package/packages/vite/src/ember.ts

@@ -59,9 +59,20 @@ function absolutePath(relativePath: string) {
  *
  * The plugins are named, not imported.
  * babel resolves them from the project, which carries them as its own dependencies.
+ *
+ * The macros take development mode from the vite mode.
+ * `buildMacros` reads NODE_ENV, but vite sets NODE_ENV
+ * only after the config hooks run.
  */
-function defaultBabelPlugins() {
-  const macros = buildMacros();
+function defaultBabelPlugins(mode: string) {
+  const macros = buildMacros({
+    configure(config) {
+      if (isDev(mode)) {
+        config.enablePackageDevelopment(process.cwd());
+        config.enableRuntimeMode();
+      }
+    },
+  });
 
   return [
     [
@@ -106,11 +117,15 @@ function babelOptions(nvpConfig: Config): BabelOptions {
     return { configFile };
   }
 
+  /**
+   * The config hook fills this list, once it knows the vite mode.
+   * The babel plugins keep a reference to it, so they see the filled list.
+   */
   return {
     configFile: false,
     babelrc: false,
     babelHelpers: "inline",
-    plugins: defaultBabelPlugins(),
+    plugins: [],
   };
 }
 
@@ -210,6 +225,14 @@ export function ember(nvpConfig: Config = {}) {
          */
         await emberConfig.call(this, viteConfig, env);
 
+        if ("plugins" in babel) {
+          babel.plugins.length = 0;
+
+          for (const plugin of defaultBabelPlugins(env.mode)) {
+            babel.plugins.push(plugin);
+          }
+        }
+
         viteConfig.experimental ||= {};
         viteConfig.build ||= {};
         viteConfig.optimizeDeps ||= {};

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

@@ -44,7 +44,7 @@
     "@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

@@ -45,7 +45,7 @@
     "@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

@@ -31,7 +31,7 @@ const libraryDeps = {
   ...deps,
   "@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/base-custom-element.test.ts

@@ -50,10 +50,10 @@ async function listDist(project: Project) {
 }
 
 /**
- * The bundled chunk's own imports are hoisted above its first region marker.
+ * The bundled chunk's own imports are hoisted to its first lines.
  *
- * ember-source's doc comments below it also start lines with `import`,
- * so only that head is inspected.
+ * ember-source's doc comments further down also start lines with `import`,
+ * so only the leading import lines count.
  */
 async function chunkImports(project: Project) {
   let files = await listFiles(join(project.directory, "dist"));
@@ -62,9 +62,17 @@ async function chunkImports(project: Project) {
   expect(chunk).toBeDefined();
 
   let code = (await project.read(`dist/${chunk}`)) ?? "";
-  let head = code.split("//#region")[0] ?? "";
+  let imports: string[] = [];
 
-  return head.match(/^import .*$/gm) ?? [];
+  for (let line of code.split("\n")) {
+    if (line.startsWith("import ")) {
+      imports.push(line);
+    } else if (line.trim() !== "") {
+      break;
+    }
+  }
+
+  return imports;
 }
 
 /**

package/test/ember.nvp/base-library.test.ts

@@ -179,7 +179,6 @@ describe("base: minimal-library", () => {
       expect(declarations).toMatchInlineSnapshot(`
         "import { TOC } from "@ember/component/template-only";
         import Component from "@glimmer/component";
-        //#region src/components/badge.d.ts
         interface BadgeSignature {
           Element: HTMLSpanElement;
           Blocks: {
@@ -187,8 +186,6 @@ describe("base: minimal-library", () => {
           };
         }
         declare const Badge: TOC<BadgeSignature>;
-        //#endregion
-        //#region src/components/greeting.d.ts
         interface GreetingSignature {
           Element: HTMLParagraphElement;
           Args: {
@@ -196,10 +193,7 @@ describe("base: minimal-library", () => {
           };
         }
         declare class Greeting extends Component<GreetingSignature> {}
-        //#endregion
-        //#region src/utils/math.d.ts
         declare function add(a: number, b: number): number;
-        //#endregion
         export { Badge, type BadgeSignature, Greeting, type GreetingSignature, add };
         //# sourceMappingURL=index.d.ts.map"
       `);

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"),

package/test/ember.nvp/scoped-css-library.test.ts

@@ -168,16 +168,13 @@ describe("library with ember-scoped-css", () => {
       import { precompileTemplate } from "@ember/template-compilation";
       import { setComponentTemplate } from "@ember/component";
       import templateOnly from "@ember/component/template-only";
-      //#region src/components/badge.ts
+      // src/components/badge.ts
       const Badge = setComponentTemplate(precompileTemplate("<span class=\\"badge_e1025e732\\" ...attributes>{{yield}}</span>", { strictMode: true }), templateOnly());
-      //#endregion
-      //#region src/components/banner.ts
+      // src/components/banner.ts
       const Banner = setComponentTemplate(precompileTemplate("\\n<div class=\\"banner_e88952290\\" ...attributes>{{yield}}</div>", { strictMode: true }), templateOnly());
-      //#endregion
-      //#region src/components/chip.ts
+      // src/components/chip.ts
       const chipClass = "chip_ec34dd962";
       const Chip = setComponentTemplate(precompileTemplate("<span class=\\"chip_ec34dd962\\" ...attributes></span>", { strictMode: true }), templateOnly());
-      //#endregion
       export { Badge, Banner, Chip, chipClass };
 
       //# sourceMappingURL=index.js.map"