ember.nvp 0.2.6 → 0.4.0

package/.release-plan.json

@@ -1,31 +1,29 @@
 {
   "solution": {
     "ember.nvp": {
-      "impact": "patch",
-      "oldVersion": "0.2.5",
-      "newVersion": "0.2.6",
+      "impact": "minor",
+      "oldVersion": "0.3.0",
+      "newVersion": "0.4.0",
       "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 :house: Internal"
         }
       ],
       "pkgJSONPath": "./package.json"
     },
     "@nullvoxpopuli/ember-vite": {
-      "impact": "patch",
-      "oldVersion": "1.0.2",
-      "newVersion": "1.0.3",
-      "tagName": "latest",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "./packages/vite/package.json"
+      "oldVersion": "1.0.3"
     }
   },
-  "description": "## Release (2026-06-22)\n\n* ember.nvp 0.2.6 (patch)\n* @nullvoxpopuli/ember-vite 1.0.3 (patch)\n\n#### :bug: Bug Fix\n* `@nullvoxpopuli/ember-vite`, `ember.nvp`\n  * [#46](https://github.com/NullVoxPopuli/ember.nvp/pull/46) compile ts authored packages ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
+  "description": "## Release (2026-06-23)\n\n* ember.nvp 0.4.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#48](https://github.com/NullVoxPopuli/ember.nvp/pull/48) replaceOrUpdate ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :bug: Bug Fix\n* `ember.nvp`\n  * [#52](https://github.com/NullVoxPopuli/ember.nvp/pull/52) Fix test-helper ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :house: Internal\n* `ember.nvp`\n  * [#50](https://github.com/NullVoxPopuli/ember.nvp/pull/50) Tests for qunit ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#49](https://github.com/NullVoxPopuli/ember.nvp/pull/49) Prepare Release ([@github-actions[bot]](https://github.com/apps/github-actions))\n\n#### Committers: 2\n- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## Release (2026-06-23)
+
+* ember.nvp 0.4.0 (minor)
+
+#### :rocket: Enhancement
+* `ember.nvp`
+  * [#48](https://github.com/NullVoxPopuli/ember.nvp/pull/48) replaceOrUpdate ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `ember.nvp`
+  * [#52](https://github.com/NullVoxPopuli/ember.nvp/pull/52) Fix test-helper ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* `ember.nvp`
+  * [#50](https://github.com/NullVoxPopuli/ember.nvp/pull/50) Tests for qunit ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#49](https://github.com/NullVoxPopuli/ember.nvp/pull/49) Prepare Release ([@github-actions[bot]](https://github.com/apps/github-actions))
+
+#### Committers: 2
+- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+## Release (2026-06-22)
+
+* ember.nvp 0.3.0 (minor)
+
+#### :rocket: Enhancement
+* `ember.nvp`
+  * [#48](https://github.com/NullVoxPopuli/ember.nvp/pull/48) replaceOrUpdate ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### Committers: 1
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2026-06-22)
 
 * ember.nvp 0.2.6 (patch)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "0.2.6",
+  "version": "0.4.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/src/cli/args.js

@@ -30,10 +30,15 @@ const { values } = parseArgs({
       type: "string",
       choices: ["npm", "pnpm"],
     },
+
+    replaceOrUpdate: {
+      type: "string",
+      choices: ["replace", "update"],
+    },
   },
 });
 
-const { name, type, layers = [], packageManager, path, confirm } = values;
+const { replaceOrUpdate, name, type, layers = [], packageManager, path, confirm } = values;
 
 export const answers = {
   name,
@@ -42,6 +47,7 @@ export const answers = {
   packageManager,
   path,
   confirm,
+  replaceOrUpdate,
 };
 
 /**

package/src/cli/generator.js

@@ -1,4 +1,4 @@
-import { mkdir } from "node:fs/promises";
+import { mkdir, rm } from "node:fs/promises";
 
 import baseApp from "#bases/minimal-app";
 import baseLibrary from "#bases/minimal-library";
@@ -8,8 +8,13 @@ import { hasGit } from "#utils/git.js";
  * Generate project files by running layer functions
  *
  * @param {import('#utils/project.js').Project} project
+ * @param {string} [replaceOrUpdate]
  */
-export async function generateProject(project) {
+export async function generateProject(project, replaceOrUpdate) {
+  if (replaceOrUpdate === "replace") {
+    await rm(project.directory, { recursive: true });
+  }
+
   await mkdir(project.directory, { recursive: true });
 
   switch (project.desires.type) {

package/src/cli/index.js

@@ -10,6 +10,7 @@ import { askPath } from "./questions/path.js";
 import { askIfOK } from "./questions/ok.js";
 import { styleText } from "node:util";
 import { Project } from "#utils/project.js";
+import { askReplaceOrUpdate } from "./questions/replace-or-update.js";
 
 /**
  * This whole file's primary purpose is to be an interactive CLI
@@ -25,6 +26,7 @@ async function main() {
 
   const projectName = await askName();
   const projectPath = await askPath(projectName);
+  const replaceOrUpdate = await askReplaceOrUpdate(projectPath);
   const projectType = await askProjectType();
   const selectedLayers = await askLayers();
   const packageManager = await askPackageManager();
@@ -44,7 +46,7 @@ async function main() {
 
   try {
     // Generate the project
-    await generateProject(project);
+    await generateProject(project, replaceOrUpdate);
 
     s.stop("Project created!");
 

package/src/cli/questions/replace-or-update.js

@@ -0,0 +1,56 @@
+import * as p from "@clack/prompts";
+
+import { answers, printArgInUse } from "#args";
+import { existsSync } from "node:fs";
+
+/**
+ *
+ * @param {string | undefined} value
+ * @returns
+ */
+function isValid(value) {
+  if (!value) return false;
+
+  return value === "replace" || value === "update";
+}
+
+/**
+ * @param {string} projectPath -- the path the project will be generated in
+ */
+export async function askReplaceOrUpdate(projectPath) {
+  if (!existsSync(projectPath)) {
+    return;
+  }
+
+  if (answers.replaceOrUpdate) {
+    if (isValid(answers.replaceOrUpdate)) {
+      printArgInUse("replaceOrUpdate", answers.replaceOrUpdate);
+
+      return answers.replaceOrUpdate;
+    }
+  }
+
+  const answer = await p.select({
+    message: "Replace or update at the selected path",
+    initialValue: "update",
+    options: [
+      {
+        value: "update",
+        label: "update",
+        hint: "Updates the project in the target directory, if one exists",
+      },
+      {
+        value: "replace",
+        label: "replace",
+        hint: "Deletes the target directory and generates a new project",
+      },
+    ],
+  });
+
+  if (p.isCancel(answer)) {
+    p.cancel("Operation cancelled");
+    return process.exit(0);
+  }
+
+  return answer;
+}

package/src/layers/qunit/files/tests/test-helper.ts

@@ -12,9 +12,6 @@ import * as QUnit from "qunit";
 import { setup } from "qunit-dom";
 import { setupEmberOnerrorValidation, start as qunitStart } from "ember-qunit";
 import { setTesting } from "@embroider/macros";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-import { getGlobalConfig } from "@embroider/macros/src/addon/runtime";
 
 import Application from "#app/app";
 import config from "#config";
@@ -43,19 +40,8 @@ export function start() {
   config.locationType = "none";
   config.APP.rootElement = "#ember-testing";
   config.APP.autoboot = false;
-  setTesting(true);
-
-  const theMacrosGlobal = getGlobalConfig();
-
-  /**
-   * Caveats:
-   * - https://github.com/embroider-build/embroider/issues/2660
-   * - https://github.com/embroider-build/embroider/issues/1998
-   *
-   */
-  theMacrosGlobal["@embroider/macros"] ||= {};
-  theMacrosGlobal["@embroider/macros"].isTesting ||= true;
 
+  setTesting(true);
   setApplication(Application.create(config.APP));
   setup(QUnit.assert);
   setupEmberOnerrorValidation();

package/test/ember.nvp/generator-replace-or-update.test.ts

@@ -0,0 +1,92 @@
+import { describe, it, expect, afterAll } from "vitest";
+import { generate, layers, expectIsSetup } from "#test-helpers";
+import { generateProject } from "ember.nvp";
+import { writeFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { rimraf } from "rimraf";
+
+/**
+ * The replace-or-update question only matters when a project already exists
+ * at the target path. These tests generate a project, assert the baseline
+ * state, then regenerate over it the way the CLI does once the user has
+ * answered the question, and assert the resulting project output is correct
+ * for each answer.
+ */
+describe("generating over an existing project", () => {
+  const prettier = layers.find((layer) => layer.name === "prettier")!;
+  const dirs: string[] = [];
+
+  afterAll(async () => {
+    if (process.env.CI) return;
+
+    for (const dir of dirs) {
+      await rimraf(dir, { maxRetries: 3, retryDelay: 100 });
+    }
+  });
+
+  it("'update' regenerates in place, keeping unrelated files", async () => {
+    const project = await generate({ type: "app", layers: ["prettier"] });
+    dirs.push(project.directory);
+
+    const userFile = join(project.directory, "my-untracked-file.txt");
+    await writeFile(userFile, "the user added this");
+
+    // Baseline: a valid project exists, with the desired layer and the
+    // user's own file present.
+    expect(existsSync(join(project.directory, "package.json")), "baseline package.json").toBe(true);
+    expect(existsSync(userFile), "baseline user file").toBe(true);
+    await expectIsSetup(project, prettier);
+
+    await generateProject(project, "update");
+
+    // After update: the pre-existing project and the user's file are
+    // preserved, and it is still a valid, fully-set-up project.
+    expect(existsSync(userFile), "unrelated file preserved by update").toBe(true);
+    expect(existsSync(join(project.directory, "package.json"))).toBe(true);
+    await expectIsSetup(project, prettier);
+  });
+
+  it("'replace' wipes the directory and produces a fresh project", async () => {
+    const project = await generate({ type: "app", layers: ["prettier"] });
+    dirs.push(project.directory);
+
+    const userFile = join(project.directory, "my-untracked-file.txt");
+    await writeFile(userFile, "the user added this");
+
+    // Baseline: a valid project exists, with the desired layer and the
+    // user's own file present.
+    expect(existsSync(join(project.directory, "package.json")), "baseline package.json").toBe(true);
+    expect(existsSync(userFile), "baseline user file").toBe(true);
+    await expectIsSetup(project, prettier);
+
+    await generateProject(project, "replace");
+
+    // After replace: everything that was there before is gone, replaced by a
+    // freshly generated, valid project with the desired layers.
+    expect(existsSync(userFile), "stale file removed by replace").toBe(false);
+    expect(existsSync(join(project.directory, "package.json"))).toBe(true);
+    await expectIsSetup(project, prettier);
+  });
+
+  it("defaults to a non-destructive update when no answer is given", async () => {
+    const project = await generate({ type: "app", layers: ["prettier"] });
+    dirs.push(project.directory);
+
+    const userFile = join(project.directory, "my-untracked-file.txt");
+    await writeFile(userFile, "the user added this");
+
+    // Baseline: a valid project exists, with the desired layer and the
+    // user's own file present.
+    expect(existsSync(join(project.directory, "package.json")), "baseline package.json").toBe(true);
+    expect(existsSync(userFile), "baseline user file").toBe(true);
+    await expectIsSetup(project, prettier);
+
+    await generateProject(project);
+
+    // After a no-arg regenerate: nothing is destroyed.
+    expect(existsSync(userFile), "unrelated file preserved by default").toBe(true);
+    expect(existsSync(join(project.directory, "package.json"))).toBe(true);
+    await expectIsSetup(project, prettier);
+  });
+});

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

@@ -0,0 +1,34 @@
+import { describe, it, afterAll, expect } from "vitest";
+import { generate } from "#test-helpers";
+import { rimraf } from "rimraf";
+import { execa } from "execa";
+
+/**
+ * The replace-or-update question only matters when a project already exists
+ * at the target path. These tests generate a project, assert the baseline
+ * state, then regenerate over it the way the CLI does once the user has
+ * answered the question, and assert the resulting project output is correct
+ * for each answer.
+ */
+describe("layer: qunit", () => {
+  const dirs: string[] = [];
+
+  afterAll(async () => {
+    if (process.env.CI) return;
+
+    for (const dir of dirs) {
+      await rimraf(dir, { maxRetries: 3, retryDelay: 100 });
+    }
+  });
+
+  it("it boots and run tests", async () => {
+    const project = await generate({ type: "app", layers: ["qunit"] });
+    dirs.push(project.directory);
+
+    let install = await execa("pnpm install", { cwd: project.directory, shell: true });
+    expect(install.exitCode).toBe(0);
+
+    let test = await execa("pnpm test", { cwd: project.directory, shell: true });
+    expect(test.exitCode).toBe(0);
+  });
+});