ember.nvp 1.14.0 → 1.16.0

package/.release-plan.json

@@ -2,13 +2,17 @@
   "solution": {
     "ember.nvp": {
       "impact": "minor",
-      "oldVersion": "1.13.0",
-      "newVersion": "1.14.0",
+      "oldVersion": "1.15.0",
+      "newVersion": "1.16.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,39 @@
       "oldVersion": "1.2.0"
     },
     "@nullvoxpopuli/ember-rolldown": {
-      "oldVersion": "2.10.0"
+      "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"
     },
     "@nullvoxpopuli/ember-vite": {
-      "oldVersion": "1.2.0"
+      "impact": "minor",
+      "oldVersion": "1.2.0",
+      "newVersion": "1.3.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/vite/package.json"
     }
   },
-  "description": "## Release (2026-09-30)\n\n* ember.nvp 1.14.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#156](https://github.com/NullVoxPopuli/ember.nvp/pull/156) Give TypeScript libraries with tests a publish tsconfig ([@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-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"
 }

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 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)
+
+#### :rocket: Enhancement
+* `ember.nvp`
+  * [#158](https://github.com/NullVoxPopuli/ember.nvp/pull/158) Migrate projects from the older blueprints ([@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-09-30)
 
 * ember.nvp 1.14.0 (minor)

package/README.md

@@ -59,6 +59,29 @@ The accepted changes land as uncommitted edits, for you to review with your own
 New projects skip the confirmation, and are written as soon as generation succeeds.
 For scripting, `--write yes` / `--write no` answers the confirmation up front.
 
+### Migrating from an older blueprint
+
+Run ember.nvp in a project from one of these blueprints, and choose update:
+
+| Blueprint                                                                       | Becomes   |
+| ------------------------------------------------------------------------------- | --------- |
+| `@ember/addon-blueprint`, and the addon package of `@embroider/addon-blueprint` | a library |
+| `@ember-tooling/classic-build-addon-blueprint` (classic addons)                 | a library |
+| `@ember/app-blueprint` (Vite with `@embroider/compat`)                          | an app    |
+| `@ember-tooling/classic-build-app-blueprint` (classic apps)                     | an app    |
+
+ember.nvp checks the project before it asks about layers.
+When the project uses something that ember.nvp does not support, such as v1 addons or `.hbs` templates, ember.nvp lists each item with what to do, and writes nothing.
+Most of these items also work in the old setup, so you can fix them there first.
+
+Otherwise, the migration keeps your code, and replaces the old build:
+
+- libraries build with tsdown, and keep `addon-main.cjs`, so that apps with ember-cli can still use them
+- apps build with Vite, without `@embroider/compat`
+
+The layers that replace the old tooling, such as qunit for the tests, start selected.
+After writing, ember.nvp lists what is left for you, such as settings to copy by hand.
+
 ### Wrapping
 
 The provided CLI is only a wrapper around the exported `generateProject` function.
@@ -84,6 +107,11 @@ await generateProject(new Project(
 
 All parts of the generator are idempotent, so running generators on existing projects _can_ no-op.
 
+A project from an older blueprint is migrated first.
+`generateProject` returns `{ todo }`, the list of what is left for the user.
+When the project needs changes before it can migrate, `generateProject` throws a `MigrationError` with a `findings` list, and changes nothing.
+`checkMigration(project)` gives the same lists without changing anything, and `formatFindings(findings)` prints them the way the CLI does.
+
 To get the same don't-write-until-confirmed behavior as the CLI, wrap generation in a `Stage`.
 A stage is a scratch copy of the target directory (without `node_modules` and `.git`).
 Layers run against that copy, and the target directory is untouched until you commit.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "1.14.0",
+  "version": "1.16.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",
@@ -13,6 +13,7 @@
     "#bases/*": "./src/bases/*/index.js",
     "#consolidators/*": "./src/consolidators/*",
     "#layers": "./src/layers/index.js",
+    "#migration-from": "./src/migration-from/index.js",
     "#types": "./src/utils/types.ts",
     "#utils/*": "./src/utils/*",
     "#test-helpers": "./test/test-helpers.ts"

package/packages/rolldown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nullvoxpopuli/ember-rolldown",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Meta plugin for building ember v2 libraries/addons with rolldown & tsdown.",
   "type": "module",
   "main": "index.ts",
@@ -45,7 +45,7 @@
   "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",

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

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

package/src/cli/generator.js

@@ -1,13 +1,19 @@
 import { mkdir, rm } from "node:fs/promises";
 
 import { bases } from "#bases";
+import { migrate } from "#migration-from";
 import { consolidateLintingScripts } from "../consolidators/linting.js";
 import { hasGit } from "#utils/git.js";
 /**
  * Generate project files by running layer functions
  *
+ * A project from an older blueprint is migrated first.
+ * When it uses features that ember.nvp does not support,
+ * this throws a `MigrationError` that lists them, before anything changes.
+ *
  * @param {import('#utils/project.js').Project} project
  * @param {string} [replaceOrUpdate]
+ * @returns {Promise<{ todo: import('#types').Finding[] }>} work left for the user after a migration
  */
 export async function generateProject(project, replaceOrUpdate) {
   if (replaceOrUpdate === "replace") {
@@ -16,6 +22,8 @@ export async function generateProject(project, replaceOrUpdate) {
 
   await mkdir(project.directory, { recursive: true });
 
+  let migration = await migrate(project);
+
   await bases[project.desires.type].run(project);
 
   /**
@@ -51,6 +59,8 @@ export async function generateProject(project, replaceOrUpdate) {
       `[ember.nvp] Consolidation commit -- Please report issues to https://github.com/NullVoxPopuli/ember.nvp/`,
     );
   }
+
+  return { todo: migration?.report.todo ?? [] };
 }
 
 /**

package/src/cli/index.js

@@ -17,6 +17,8 @@ import { cwd } from "#utils/cwd.js";
 import { Project } from "#utils/project.js";
 import { Stage } from "#utils/stage.js";
 import { askAboutProjectHere, askReplaceOrUpdate } from "./questions/replace-or-update.js";
+import { checkForMigration, showTodo } from "./questions/migration.js";
+import { MigrationError } from "#migration-from";
 
 /**
  * This whole file's primary purpose is to be an interactive CLI
@@ -35,7 +37,11 @@ async function main() {
   const projectPath = here ? cwd : await askPath(projectName);
   const replaceOrUpdate = here ?? (await askReplaceOrUpdate(projectPath));
   const projectType = await askProjectType(replaceOrUpdate === "update" ? projectPath : undefined);
-  const selectedLayers = await askLayers(projectType);
+  const migrationLayers =
+    replaceOrUpdate === "update"
+      ? await checkForMigration(projectPath, projectName, projectType)
+      : [];
+  const selectedLayers = await askLayers(projectType, migrationLayers);
   const packageManager = await askPackageManager();
 
   // Layer options start from what the project already uses
@@ -82,9 +88,12 @@ async function main() {
   const s = p.spinner();
   s.start("Creating your Ember app...");
 
+  /** @type {import('#types').Finding[]} */
+  let todo = [];
+
   try {
     // Generate the project (into the stage)
-    await generateProject(project);
+    ({ todo } = await generateProject(project));
 
     s.stop("Project generated");
   } catch (err) {
@@ -92,6 +101,12 @@ async function main() {
 
     await stage.discard();
 
+    // the message is the list for the user, and a stack trace adds nothing to it
+    if (err instanceof MigrationError) {
+      p.cancel(err.message);
+      process.exit(1);
+    }
+
     if (err instanceof Error) {
       p.cancel(`Error: ${err.message}`);
       if (err.stack) {
@@ -141,6 +156,8 @@ async function main() {
 
   p.log.success(`Applied ${toApply.length} change${toApply.length === 1 ? "" : "s"}`);
 
+  showTodo(todo);
+
   /**
    * Converted / generated files are written expecting the project's own
    * formatting and lint pass to run right away.

package/src/cli/questions/layers.js

@@ -5,8 +5,9 @@ import * as p from "@clack/prompts";
 
 /**
  * @param {import('#types').ProjectType} projectType
+ * @param {string[]} [suggested] layers to select by default, beyond each layer's own default
  */
-export async function askLayers(projectType) {
+export async function askLayers(projectType, suggested = []) {
   const optionalLayers = (await discoverLayers()).filter(
     (layer) => typeof layer.run === "function",
   );
@@ -37,7 +38,7 @@ export async function askLayers(projectType) {
   const defaultValues = (
     await Promise.all(
       optionalLayers.map(async (layer) => {
-        let result = await layer.defaultValue?.(projectType);
+        let result = suggested.includes(layer.name) || (await layer.defaultValue?.(projectType));
 
         return result && layer.name;
       }),

package/src/cli/questions/migration.js

@@ -0,0 +1,69 @@
+import * as p from "@clack/prompts";
+import { styleText } from "node:util";
+import { checkMigration, formatFindings } from "#migration-from";
+import { Project } from "#utils/project.js";
+
+/**
+ * A project from an older blueprint is migrated during the update.
+ *
+ * The check runs before the layer questions,
+ * so that a project that ember.nvp cannot migrate stops here,
+ * with the list of what to change first.
+ *
+ * @param {string} projectPath
+ * @param {string} name
+ * @param {import('#types').ProjectType} type
+ * @returns {Promise<string[]>} layers that replace the old blueprint's tooling
+ */
+export async function checkForMigration(projectPath, name, type) {
+  let project = new Project(projectPath, {
+    name,
+    type,
+    path: projectPath,
+    layers: [],
+    packageManager: "pnpm",
+  });
+
+  let spinner = p.spinner();
+
+  spinner.start("Checking for an older blueprint");
+
+  let result = await checkMigration(project);
+
+  if (!result) {
+    spinner.stop("No older blueprint found");
+    return [];
+  }
+
+  let { migration, report } = result;
+
+  if (report.unsupported.length > 0) {
+    spinner.stop(`This project is from ${migration.label}`);
+    p.log.error(
+      `ember.nvp cannot migrate this project yet. Change these first:\n\n` +
+        formatFindings(report.unsupported),
+    );
+
+    if (report.todo.length > 0) {
+      p.log.info(
+        `After that, the migration leaves these for you:\n\n${formatFindings(report.todo)}`,
+      );
+    }
+
+    p.cancel("Nothing was written");
+    return process.exit(1);
+  }
+
+  spinner.stop(`Migrating from ${styleText("cyan", migration.label)}`);
+
+  return report.layers;
+}
+
+/**
+ * @param {import('#types').Finding[]} todo
+ */
+export function showTodo(todo) {
+  if (todo.length === 0) return;
+
+  p.note(formatFindings(todo), "Left to do after the migration");
+}

package/src/index.js

@@ -1,3 +1,4 @@
 export { generateProject } from "./cli/generator.js";
 export { Project } from "./utils/project.js";
 export { Stage } from "./utils/stage.js";
+export { checkMigration, formatFindings, MigrationError } from "./migration-from/index.js";

package/src/layers/qunit/index.js

@@ -29,7 +29,7 @@ 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",
   vite: "^8.0.14",