ember.nvp 0.1.0 → 0.2.0

package/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [main]
+
+##############################################################
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  HOME: /tmp/home
+  WORKSPACE: /tmp/workspace
+
+jobs:
+  lints:
+    name: "Lint"
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - uses: wyvox/action@v1
+      - run: pnpm lint
+
+  node_tests:
+    name: "Node Tests"
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - uses: wyvox/action@v1
+      - run: |
+          git config --global user.name "ci"
+          git config --global user.email "non@none.none"
+          pnpm test:node

package/.github/workflows/plan-release.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: release-plan/actions/should-prepare-release@v1
         with:
-          ref: 'main'
+          ref: "main"
         id: should-prepare
 
   create-prepare-release-pr:
@@ -40,7 +40,7 @@ jobs:
       - uses: release-plan/actions/prepare@v1
         name: Run release-plan prepare
         with:
-          ref: 'main'
+          ref: "main"
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
         id: explanation

package/.github/workflows/publish.yml

@@ -10,7 +10,7 @@ on:
       - main
       - master
     paths:
-      - '.release-plan.json'
+      - ".release-plan.json"
 
 concurrency:
   group: publish-${{ github.head_ref || github.ref }}
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/setup-node@v6
         with:
           node-version: 22
-          registry-url: 'https://registry.npmjs.org'
+          registry-url: "https://registry.npmjs.org"
           cache: pnpm
       - run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC
       - run: pnpm install --frozen-lockfile

package/.prettierignore

@@ -1,2 +1,3 @@
 pnpm-lock.yaml
-
+CHANGELOG.md
+dist

package/.prettierrc.js

@@ -0,0 +1,10 @@
+/**
+ * @see https://prettier.io/docs/configuration
+ * @type {import("prettier").Config}
+ */
+const config = {
+  printWidth: 100,
+  plugins: ["prettier-plugin-ember-template-tag"],
+};
+
+export default config;

package/.release-plan.json

@@ -2,14 +2,22 @@
   "solution": {
     "ember.nvp": {
       "impact": "minor",
-      "oldVersion": "0.0.0",
-      "newVersion": "0.1.0",
+      "oldVersion": "0.1.0",
+      "newVersion": "0.2.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 :memo: Documentation"
+        },
         {
           "impact": "patch",
           "reason": "Appears in changelog section :house: Internal"
@@ -18,5 +26,5 @@
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2026-01-21)\n\n* ember.nvp 0.1.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#1](https://github.com/NullVoxPopuli/ember.nvp/pull/1) Implementation planning ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :house: Internal\n* `ember.nvp`\n  * [#2](https://github.com/NullVoxPopuli/ember.nvp/pull/2) pnpm dlx create-release-plan-setup@latest --update ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#1](https://github.com/NullVoxPopuli/ember.nvp/pull/1) Implementation planning ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
+  "description": "## Release (2026-01-28)\n\n* ember.nvp 0.2.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#20](https://github.com/NullVoxPopuli/ember.nvp/pull/20) Implement idemponent and modern qunit layer ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#18](https://github.com/NullVoxPopuli/ember.nvp/pull/18) Ensure the TS utilities handle the babel plugin ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#17](https://github.com/NullVoxPopuli/ember.nvp/pull/17) Support emitting JavaScript projects ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#16](https://github.com/NullVoxPopuli/ember.nvp/pull/16) Commit changes automatically if git is in use ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#14](https://github.com/NullVoxPopuli/ember.nvp/pull/14) Add idempotent GitHub Actions ci.yml ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#11](https://github.com/NullVoxPopuli/ember.nvp/pull/11) Add idempotent renovate config generation ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#9](https://github.com/NullVoxPopuli/ember.nvp/pull/9)  Add eslint codemod/applyable, enable type checking internally on the JS ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#8](https://github.com/NullVoxPopuli/ember.nvp/pull/8) Add idempotent prettier codemod/applyable ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#6](https://github.com/NullVoxPopuli/ember.nvp/pull/6) Add git support with proper defaults (ie automatic --skip-git if you are already in a git repo) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#4](https://github.com/NullVoxPopuli/ember.nvp/pull/4) Implementation: minimal-app ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :bug: Bug Fix\n* `ember.nvp`\n  * [#22](https://github.com/NullVoxPopuli/ember.nvp/pull/22) Fix accidental stdoutput during git interactions ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#10](https://github.com/NullVoxPopuli/ember.nvp/pull/10) Various CLI fixes ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :memo: Documentation\n* `ember.nvp`\n  * [#12](https://github.com/NullVoxPopuli/ember.nvp/pull/12) Clarify rationale and usage caveats in README ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :house: Internal\n* `ember.nvp`\n  * [#19](https://github.com/NullVoxPopuli/ember.nvp/pull/19) Forgot to enable tests for GH Actions ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#21](https://github.com/NullVoxPopuli/ember.nvp/pull/21) Refactor hases and wantses ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#15](https://github.com/NullVoxPopuli/ember.nvp/pull/15) Add reapply test utility for more easily re-applying layers in the manual testing ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#13](https://github.com/NullVoxPopuli/ember.nvp/pull/13) Speed up permutations test ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#7](https://github.com/NullVoxPopuli/ember.nvp/pull/7) Implement idempotent testing for layers that may (or may not) have been applied during the initial generation of a project ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## Release (2026-01-28)
+
+* ember.nvp 0.2.0 (minor)
+
+#### :rocket: Enhancement
+* `ember.nvp`
+  * [#20](https://github.com/NullVoxPopuli/ember.nvp/pull/20) Implement idemponent and modern qunit layer ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#18](https://github.com/NullVoxPopuli/ember.nvp/pull/18) Ensure the TS utilities handle the babel plugin ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#17](https://github.com/NullVoxPopuli/ember.nvp/pull/17) Support emitting JavaScript projects ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#16](https://github.com/NullVoxPopuli/ember.nvp/pull/16) Commit changes automatically if git is in use ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#14](https://github.com/NullVoxPopuli/ember.nvp/pull/14) Add idempotent GitHub Actions ci.yml ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#11](https://github.com/NullVoxPopuli/ember.nvp/pull/11) Add idempotent renovate config generation ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#9](https://github.com/NullVoxPopuli/ember.nvp/pull/9)  Add eslint codemod/applyable, enable type checking internally on the JS ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#8](https://github.com/NullVoxPopuli/ember.nvp/pull/8) Add idempotent prettier codemod/applyable ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#6](https://github.com/NullVoxPopuli/ember.nvp/pull/6) Add git support with proper defaults (ie automatic --skip-git if you are already in a git repo) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#4](https://github.com/NullVoxPopuli/ember.nvp/pull/4) Implementation: minimal-app ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `ember.nvp`
+  * [#22](https://github.com/NullVoxPopuli/ember.nvp/pull/22) Fix accidental stdoutput during git interactions ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#10](https://github.com/NullVoxPopuli/ember.nvp/pull/10) Various CLI fixes ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :memo: Documentation
+* `ember.nvp`
+  * [#12](https://github.com/NullVoxPopuli/ember.nvp/pull/12) Clarify rationale and usage caveats in README ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* `ember.nvp`
+  * [#19](https://github.com/NullVoxPopuli/ember.nvp/pull/19) Forgot to enable tests for GH Actions ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#21](https://github.com/NullVoxPopuli/ember.nvp/pull/21) Refactor hases and wantses ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#15](https://github.com/NullVoxPopuli/ember.nvp/pull/15) Add reapply test utility for more easily re-applying layers in the manual testing ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#13](https://github.com/NullVoxPopuli/ember.nvp/pull/13) Speed up permutations test ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#7](https://github.com/NullVoxPopuli/ember.nvp/pull/7) Implement idempotent testing for layers that may (or may not) have been applied during the initial generation of a project ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### Committers: 1
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2026-01-21)
 
 * ember.nvp 0.1.0 (minor)

package/README.md

@@ -1,88 +1,84 @@
 # ember.nvp
 
-_ember project generator: alternative to the official blueprints, but more modern -- hopefully one day to upstream back in to ember-cli / official blueprints_
+_ember project generator: a reenvisioning of blueprints -- hopefully one day to upstream back in to ember-cli / official blueprints, **if** all the caveats can be cleaned up_
 
-## Reqs
-
-- node 24+
+> [!NOTE]
+> **Why isn't this work happening in the default blueprints?** for a long time now, I've felt the old blueprint system from the very early days of ember-cli has not allowed for expressive enough layering of what people actually want out of a project generator. That said, that means there are some compromises in the CLI/generator in this repo. Throughout all files generated, whenever there is a caveat, there will be a comment in the file with the caveat, explaining status, open issues, and how we can collectively move forward. It's possible that one day ember-cli adopts or is inspired by this project, but it's too early to tell at the moment.
 
-## What this does?
+_I can't recommend using this tool unless your comfortable with the emitted caveats in the project_.
+(And being comfortable debugging build issues is recommended)
 
-- Always `"type": "module"`
-- Interactive CLI
-  - choose your features
-
-Good for:
-
-- demos
-- reproductions
-- existing monorepos
-- example integrations with other tools
+But I'm very excited about this tool, because it's everything I've ever wanted from a project generator. Each layer is idempotent, and knows about the other layers. So if, for example, you omit eslint when setting up your project, but do have github-actions, when you do add eslint, your github-actions will be updated as well. And this works in any order.
 
 ## Usage
 
-Install dependencies first:
-
 ```bash
-pnpm install
+npx ember.nvp
 ```
 
-Then run the interactive CLI:
+or, faster:
 
 ```bash
-node src/cli/index.js
+pnpm dlx ember.nvp
 ```
 
-Or link it locally for easier testing:
+Using the unreleased version:
 
 ```bash
-pnpm link --global
-ember.nvp
+pnpm dlx NullVoxPopuli/ember.nvp
+# or, slower:
+npx NullVoxPopuli/ember.nvp
 ```
 
-### Example Session
+### Wrapping
 
+The provided CLI is only a wrapper around our exported `generateProject` function.
+
+Other tools can call `generateProject` themselves if they wish to provide a different terminal or graphical UI.
+
+```js
+import { generateProject, Project } from 'ember.nvp';
+
+
+await generateProject(new Project(
+    directoryToGenerateIn
+    // desires
+    {
+        name,
+        path,
+        type,
+        layers,
+        packageManager,
+    }
+));
 ```
-┌  ember.nvp
-│
-◆  What is your project name?
-│  my-awesome-app
-│
-◇  Base Layer
-│  minimal layer is always included.
-│  It provides: type: "module", no compat, no testing, no linting.
-│  Perfect for demos and reproductions.
-│
-◆  Select additional features: (press space to select)
-│  ◻ ESLint - Code linting with ESLint
-│  ◻ Prettier - Code formatting with Prettier
-│  ◻ QUnit - Testing with QUnit
-│  ◻ Vitest - Testing with Vitest (modern & fast)
-│
-◆  Which package manager?
-│  ● pnpm - Fast, disk space efficient
-│    npm - Node default
-│    yarn - Classic alternative
-│
-◇  Project created!
-│
-◇  Next steps
-│  cd my-awesome-app
-│  pnpm install
-│  pnpm start
-│
-└  ✓ Project ready! Happy coding!
-```
 
-The CLI will guide you through:
+All parts of the generator are idempotent, so running generators on existing projects _can_ no-op.
+
+## Reqs
+
+- node 24+
+
+## What this does?
+
+- Always `"type": "module"`
+- Modern, incremental
+- Interactive CLI
+  - choose your features
+- The generators fro the different types of projects are never out of date from each other
+  - each feature/layer is a mini codemod that has to support working within all the other layers -- so eslint for example is always derived the same way -- no way for "app" and "library" configs to get out of sync
 
-1. **Project name** - Choose your project name
-2. **Feature selection** - Select which layers you want (linting, testing, formatting)
-3. **Package manager** - Choose pnpm, npm, or yarn
+Good for:
+
+- demos
+- reproductions
+- existing monorepos
+- example integrations with other tools
 
 ## Layers
 
-Each layer is a standalone module that can add features to your ember project:
+Each layer is a standalone module that can add features to your ember project,
+and every layer is aware of the other layers, so if, for example, you run github actions first, and then later decide to add linting, the github actions output will be updated.
 
 ### 🎯 Minimal (always included)
 
@@ -97,6 +93,16 @@ The base layer, matching the `--minimal` flag from [ember-cli/ember-app-blueprin
 
 Perfect for demos, reproductions, and learning!
 
+### Git
+
+Runs `git init` for you.
+
+By default this layer is enabled, _unless_ you are running the generator in a git repo already -- then you have to opt in to git.
+
+### GitHub Actions (optional)
+
+Adds simple GitHub Actions workflow to your project
+
 ### 📝 ESLint (optional)
 
 Adds modern ESLint configuration with:
@@ -116,75 +122,30 @@ Code formatting with:
 
 ### 🧪 QUnit (optional)
 
-Traditional Ember testing with:
-
-- QUnit test framework
-- @ember/test-helpers
-- Test HTML setup
-- Playwright for CI
+- Both co-located tests as well as traditionally located tests with QUnit.
+- New Theme: [qunit-theme-ember](https://github.com/IgnaceMaes/qunit-theme-ember)
+- Default utilities to help you find why tests are stuck
 
 ### ⚡ Vitest (optional)
 
-Modern testing alternative:
-
-- Vitest (faster than QUnit)
-- @ember/test-helpers
-- Happy DOM
-- Watch mode & UI
+Super experimental vitest setup using [ember-vitest](https://github.com/NullVoxPopuli/ember-vitest)
 
 ## Architecture
 
-```
-src/
-├── cli/          # Interactive CLI entry point
-│   └── index.js  # Main CLI with prompts
-├── layers/       # Feature layers (auto-discovered)
-│   ├── minimal/  # Base layer (always included)
-│   │   ├── index.js    # Layer definition with run function
-│   │   └── files/      # Template files to copy
-│   ├── eslint/
-│   │   ├── index.js
-│   │   └── files/
-│   ├── prettier/
-│   │   ├── index.js
-│   │   └── files/
-│   ├── qunit/
-│   │   ├── index.js
-│   │   └── files/
-│   └── vitest/
-│       ├── index.js
-│       └── files/
-└── lib/          # Shared utilities
-    └── generator.js  # Project generation orchestration
-```
-
-### Layer Architecture
-
-Each layer now uses **ember-apply** utilities for robust file and package.json manipulation:
-
-- **`index.js`** - Exports an object with:
-  - `label` - Display name
-  - `description` - Short description
-  - `run({ targetDir, projectName })` - Async function that applies the layer
-
-- **`files/`** - Directory containing template files to copy to the target project
-  - Use `__PROJECT_NAME__` placeholder for project name substitution
-  - Files are copied using `ember-apply`'s `files.applyFolder()`
-
 ### How Layers Work
 
 1. **Discovery**: CLI scans `src/layers/` and imports each `index.js`
 2. **Selection**: User selects which optional layers to include
 3. **Execution**: Each layer's `run()` function is called in sequence:
    ```js
-   await layer.run({ targetDir: "/path/to/project", projectName: "my-app" });
+   await layer.run(project);
    ```
-4. **Layer Functions**: Inside `run()`, layers use `ember-apply` to:
+4. **Layer Functions**: Inside `run()`, layers use [`ember-apply`](https://ember-apply.pages.dev/) to apply codemods in order to:
    - Copy files from `files/` directory
    - Add dependencies/devDependencies to package.json
    - Add npm scripts
    - Modify package.json metadata
-   - Transform existing files (e.g., replace placeholders)
+   - etc
 
 ### Adding New Layers
 
@@ -194,48 +155,24 @@ To add a new layer, create a new directory in `src/layers/` with:
 
 ```js
 import { packageJson, files } from "ember-apply";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
+import { join } from "node:path";
 
 export default {
   label: "My Feature",
   description: "What this feature does",
 
-  async run({ targetDir, projectName }) {
+  async run(project) {
     // Copy files from files/ directory
-    await files.applyFolder(join(__dirname, "files"), targetDir);
-
-    // Add dependencies
-    await packageJson.addDependencies(
-      {
-        "some-package": "^1.0.0",
-      },
-      targetDir,
-    );
-
-    // Add devDependencies
-    await packageJson.addDevDependencies(
-      {
-        "dev-package": "^2.0.0",
-      },
-      targetDir,
-    );
-
-    // Add scripts
-    await packageJson.addScripts(
-      {
-        "my-script": 'echo "Hello"',
-      },
-      targetDir,
-    );
+    await files.applyFolder(join(import.meta.dirname, "files"), project.directory);
+
+    await packageJson.addDependencies({ "some-package": "^1.0.0" }, project.directory);
+
+    await packageJson.addScripts({ "my-script": 'echo "Hello"' }, project.directory);
   },
 };
 ```
 
 2. **`files/`** directory - Template files to copy:
-   - Use `__PROJECT_NAME__` as a placeholder for the project name
    - Files will be copied to the target directory maintaining structure
 
 The CLI will automatically discover and offer it as an option!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "0.1.0",
+  "version": "0.2.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",
@@ -8,10 +8,24 @@
   },
   "type": "module",
   "bin": "./src/cli/index.js",
+  "exports": "./src/index.js",
+  "imports": {
+    "#args": "./src/cli/args.js",
+    "#bases/*": "./src/bases/*/index.js",
+    "#consolidators/*": "./src/consolidators/*",
+    "#layers": "./src/layers/index.js",
+    "#types": "./src/utils/types.ts",
+    "#utils/*": "./src/utils/*",
+    "#test-helpers": "./test/test-helpers.ts"
+  },
   "dependencies": {
     "@clack/prompts": "^0.11.0",
-    "ember-apply": "^2.16.0",
-    "picocolors": "^1.1.1"
+    "babel-remove-types": "^1.1.0",
+    "content-tag": "^4.1.0",
+    "ember-apply": "^2.17.0",
+    "execa": "^9.6.1",
+    "latest-version": "^9.0.0",
+    "package-name-regex": "^5.0.0"
   },
   "devDependencies": {
     "@ember/app-tsconfig": "^2.0.0",
@@ -19,17 +33,26 @@
     "@glint/ember-tsc": "^1.0.9",
     "@glint/template": "^1.7.3",
     "@glint/tsserver-plugin": "^2.0.9",
+    "concurrently": "^9.2.1",
     "ember-source": "^6.10.0",
     "prettier": "^3.7.4",
     "prettier-plugin-ember-template-tag": "^2.1.2",
-    "release-plan": "^0.17.4"
+    "release-plan": "^0.17.4",
+    "rimraf": "^6.1.2",
+    "vite": "^7.3.1",
+    "vitest": "^4.0.17"
   },
   "engines": {
     "node": ">= 24"
   },
   "scripts": {
+    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
+    "lint:fix": "pnpm format",
+    "lint:types": "tsc --noEmit",
     "format": "prettier . --write",
     "lint:format": "prettier . --check",
-    "new": "node ./src/cli/index.js"
+    "new": "./test/manual.sh",
+    "test:node": "FORCE_COLOR=1 vitest run --reporter=verbose --printConsoleTrace",
+    "test:vitest": "FORCE_COLOR=1 vitest"
   }
 }

package/pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+packages:
+  - .
+  - src/bases/*/files

package/src/bases/README.md

@@ -0,0 +1,5 @@
+Each of these base projects are _real_ projects that can be ran in these directories.
+
+For changing the name of a project, the code in the base layer's index.js should find all the places the name is used and swap it out (codemod style).
+
+We don't want to use ejs, because it makes the base layers unrunnable.