@ember/app-blueprint 0.6.0 → 0.7.1

package/.prettierignore

@@ -0,0 +1,8 @@
+files/
+node_modules/
+tests/fixture/
+tests/fixture-ts/
+
+*.yml
+*.yaml
+*.md

package/.release-plan.json

@@ -1,18 +1,18 @@
 {
   "solution": {
     "@ember/app-blueprint": {
-      "impact": "minor",
-      "oldVersion": "0.5.0",
-      "newVersion": "0.6.0",
+      "impact": "patch",
+      "oldVersion": "0.7.0",
+      "newVersion": "0.7.1",
       "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"
     }
   },
-  "description": "## Release (2025-06-05)\n\n* @ember/app-blueprint 0.6.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n  * [#28](https://github.com/ember-cli/ember-app-blueprint/pull/28) make sure we always use strict generators ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
+  "description": "## Release (2025-06-24)\n\n* @ember/app-blueprint 0.7.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#33](https://github.com/ember-cli/ember-app-blueprint/pull/33) Fix NODE_ENV for tests ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## Release (2025-06-24)
+
+* @ember/app-blueprint 0.7.1 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#33](https://github.com/ember-cli/ember-app-blueprint/pull/33) Fix NODE_ENV for tests ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### Committers: 1
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+## Release (2025-06-18)
+
+* @ember/app-blueprint 0.7.0 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#27](https://github.com/ember-cli/ember-app-blueprint/pull/27) Remove unused dependencies ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#35](https://github.com/ember-cli/ember-app-blueprint/pull/35) Adjust the lint command / enforce prettier in CI (our code, not for the output) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### Committers: 1
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2025-06-05)
 
 * @ember/app-blueprint 0.6.0 (minor)

package/eslint.config.mjs

@@ -25,6 +25,10 @@ export default [
   pluginJs.configs.recommended,
   eslintConfigPrettier,
   {
-    ignores: ['tests/fixture/*', 'tests/fixture-ts/*', 'files/ember-cli-build.js'],
+    ignores: [
+      'tests/fixture/*',
+      'tests/fixture-ts/*',
+      'files/ember-cli-build.js',
+    ],
   },
 ];

package/files/.env.test

@@ -0,0 +1,8 @@
+# This file is committed to git and should not contain any secrets.
+# 
+# Vite recommends using .env.local or .env.[mode].local if you need to manage secrets
+# SEE: https://vite.dev/guide/env-and-mode.html#env-files for more information.
+
+
+# Default NODE_ENV with vite build --mode=test is production
+NODE_ENV=development

package/files/package.json

@@ -74,8 +74,7 @@
     "ember-auto-import": "^2.10.0",
     "ember-cli": "~6.5.0-beta.0",
     "ember-cli-babel": "^8.2.0",
-    "ember-cli-deprecation-workflow": "^3.3.0",
-    "ember-cli-htmlbars": "^6.3.0<% if (emberData) { %>",
+    "ember-cli-deprecation-workflow": "^3.3.0<% if (emberData) { %>",
     "ember-data": "~5.5.0<% } %>",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
@@ -83,7 +82,6 @@
     "ember-qunit": "^9.0.3",
     "ember-resolver": "^13.1.1",
     "ember-source": "~6.5.0-beta.1",
-    "ember-template-imports": "^4.3.0",
     "ember-template-lint": "^7.7.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
     "eslint": "^9.27.0",

package/index.js

@@ -24,7 +24,8 @@ module.exports = {
     let name = stringUtil.dasherize(rawName);
     let namespace = stringUtil.classify(rawName);
 
-    let hasOptions = !options.welcome || options.packageManager || options.ciProvider;
+    let hasOptions =
+      !options.welcome || options.packageManager || options.ciProvider;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -66,7 +67,8 @@ module.exports = {
       blueprintVersion: require('./package').version,
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
-      npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
+      npm:
+        options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
       invokeScriptPrefix,
       execBinPrefix,
       welcome: options.welcome,
@@ -93,7 +95,9 @@ module.exports = {
 
     if (!options.typescript) {
       files = files.filter(
-        (file) => !['tsconfig.json', 'app/config/', 'types/'].includes(file) && !file.endsWith('.d.ts')
+        (file) =>
+          !['tsconfig.json', 'app/config/', 'types/'].includes(file) &&
+          !file.endsWith('.d.ts'),
       );
     }
 
@@ -110,7 +114,12 @@ module.exports = {
   beforeInstall() {
     const prependEmoji = require('./lib/prepend-emoji');
 
-    this.ui.writeLine(prependEmoji('✨', `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`));
+    this.ui.writeLine(
+      prependEmoji(
+        '✨',
+        `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`,
+      ),
+    );
   },
 
   /**

package/lib/prepend-emoji.js

@@ -2,7 +2,9 @@
 
 function supportEmoji() {
   const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
-  return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
+  return (
+    process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff
+  );
 }
 
 const areEmojiSupported = supportEmoji();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -20,6 +20,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.3.0",
+    "concurrently": "^9.1.2",
     "ember-cli": "^6.3.1",
     "eslint": "9.x",
     "eslint-config-prettier": "^9.1.0",
@@ -35,7 +36,11 @@
     "vitest": "^3.1.2"
   },
   "scripts": {
-    "lint": "eslint .",
+    "lint": "concurrently 'pnpm:lint:*(!fix)'",
+    "lint:fix": "pnpm lint:eslint && pnpm format",
+    "lint:eslint": "eslint .",
+    "lint:prettier": "prettier . --check",
+    "format": "prettier . --write",
     "test": "vitest"
   }
 }

package/tests/default.test.mjs

@@ -6,23 +6,39 @@ import { newProjectWithFixtures } from './helpers.mjs';
 
 const SCENARIOS = [
   {
+    name: 'defaults',
+    flags: [],
+    fixturePath: join(import.meta.dirname, 'fixture'),
+  },
+  {
+    name: 'compat (v1 addon support)',
+    // @glimmer/component >= 2.0.0 is a v2 addon, which we don't need when testing "compat mode"
+    // this test is "compat mode"
+    // compat mode forces us to use v1 addon infra, ember-cli, etc
     flags: [
       /* none, default */
     ],
+    packageJson: {
+      devDependencies: {
+        '@glimmer/component': '^1.1.2',
+      },
+    },
     fixturePath: join(import.meta.dirname, 'fixture'),
   },
   {
+    name: 'typescript',
     flags: ['--typescript'],
     fixturePath: join(import.meta.dirname, 'fixture-ts'),
   },
 ];
 
 describe('basic functionality', function () {
-  for (let { flags, fixturePath } of SCENARIOS) {
-    describe(`with flags: '${flags.join(' ')}'`, function () {
+  for (let { name, flags, packageJson, fixturePath } of SCENARIOS) {
+    describe(name, function () {
       let project = newProjectWithFixtures({
         fixturePath,
         flags,
+        packageJson,
       });
 
       it('verify files', async function () {

package/tests/helpers.mjs

@@ -4,7 +4,8 @@ import { beforeAll } from 'vitest';
 import { sync as resolveBinSync } from 'resolve-bin';
 import { execa } from 'execa';
 import tmp from 'tmp-promise';
-import { join } from 'path';
+import fs from 'node:fs/promises';
+import { join } from 'node:path';
 import fixturify from 'fixturify';
 
 let localEmberCli = require.resolve('ember-cli/bin/ember');
@@ -21,6 +22,7 @@ const appName = 'test-app';
 export function newProjectWithFixtures({
   flags = [],
   fixturePath,
+  packageJson = {},
   name = appName,
 } = {}) {
   let dir;
@@ -30,19 +32,21 @@ export function newProjectWithFixtures({
   beforeAll(async () => {
     const tmpDir = (await tmp.dir()).path;
     dir = join(tmpDir, name);
-    await execa({cwd: tmpDir})`${localEmberCli} new ${name} -b ${blueprintPath} --skip-git --pnpm ${flags}`;
+    await execa({
+      cwd: tmpDir,
+    })`${localEmberCli} new ${name} -b ${blueprintPath} --skip-git --pnpm ${flags}`;
 
     let addonFixture = fixturify.readSync(fixturePath);
     fixturify.writeSync(dir, addonFixture);
 
+    await mergePackageJson(dir, packageJson);
+
     // Sync the lints for the fixtures with the project's config
     await execa(`pnpm`, ['lint:fix'], {
       cwd: dir,
     });
   });
 
-
-
   return {
     appName: () => name,
     dir: () => dir,
@@ -55,3 +59,33 @@ export function newProjectWithFixtures({
     },
   };
 }
+
+async function mergePackageJson(dir, packageJson) {
+  let rootKeys = Object.keys(packageJson || {});
+
+  if (rootKeys.length === 0) {
+    return;
+  }
+
+  let packageJsonPath = join(dir, 'package.json');
+  let testPackageJson = JSON.parse(
+    (await fs.readFile(packageJsonPath)).toString(),
+  );
+
+  for (let rootKey of rootKeys) {
+    /**
+     * For searchability in logs
+     */
+    console.log(`Modifying ${rootKey} in package.json @ ${packageJsonPath}`);
+    let value = packageJson[rootKey];
+
+    let isObject = typeof value === 'object' && !Array.isArray(value);
+    if (!isObject) {
+      throw new Error(`${rootKey} customization is currently not implemented`);
+    }
+
+    Object.assign(testPackageJson[rootKey], value);
+  }
+
+  await fs.writeFile(packageJsonPath, JSON.stringify(testPackageJson, null, 2));
+}