@ember/app-blueprint 0.8.1 → 6.6.0

package/.prettierignore

@@ -1,7 +1,6 @@
 files/
 node_modules/
-tests/fixture/
-tests/fixture-ts/
+tests/fixtures/
 
 *.yml
 *.yaml

package/.release-plan.json

@@ -1,18 +1,22 @@
 {
   "solution": {
     "@ember/app-blueprint": {
-      "impact": "patch",
-      "oldVersion": "0.8.0",
-      "newVersion": "0.8.1",
+      "impact": "minor",
+      "oldVersion": "6.5.0",
+      "newVersion": "6.6.0",
       "tagName": "latest",
       "constraints": [
+        {
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
+        },
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2025-07-22)\n\n* @ember/app-blueprint 0.8.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#53](https://github.com/ember-cli/ember-app-blueprint/pull/53) Use @embroider/router ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
+  "description": "## Release (2025-09-04)\n\n* @ember/app-blueprint 6.6.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n  * [#63](https://github.com/ember-cli/ember-app-blueprint/pull/63) reset blueprint to match ember-cli app blueprint (in the next release) ([@mansona](https://github.com/mansona))\n  * [#57](https://github.com/ember-cli/ember-app-blueprint/pull/57) run update-blueprint-deps to update to Ember 6.6 ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n  * [#60](https://github.com/ember-cli/ember-app-blueprint/pull/60) Split test files ([@pichfl](https://github.com/pichfl))\n\n#### Committers: 2\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Florian Pichler ([@pichfl](https://github.com/pichfl))\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## Release (2025-09-04)
+
+* @ember/app-blueprint 6.6.0 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#63](https://github.com/ember-cli/ember-app-blueprint/pull/63) reset blueprint to match ember-cli app blueprint (in the next release) ([@mansona](https://github.com/mansona))
+  * [#57](https://github.com/ember-cli/ember-app-blueprint/pull/57) run update-blueprint-deps to update to Ember 6.6 ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#60](https://github.com/ember-cli/ember-app-blueprint/pull/60) Split test files ([@pichfl](https://github.com/pichfl))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Florian Pichler ([@pichfl](https://github.com/pichfl))
+
+## Release (2025-09-03)
+
+* @ember/app-blueprint 0.8.2 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#56](https://github.com/ember-cli/ember-app-blueprint/pull/56) Make sure that `npm run lint` doesn't fail on a newly generated app ([@pichfl](https://github.com/pichfl))
+
+#### Committers: 1
+- Florian Pichler ([@pichfl](https://github.com/pichfl))
+
 ## Release (2025-07-22)
 
 * @ember/app-blueprint 0.8.1 (patch)

package/eslint.config.mjs

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

package/files/app/config/environment.ts

@@ -3,15 +3,30 @@ import { assert } from '@ember/debug';
 
 const config = loadConfigFromMeta('<%= name %>') as unknown;
 
-assert("config is not an object", typeof config === "object" && config !== null);
-assert("modulePrefix was not detected on your config", "modulePrefix" in config && typeof config.modulePrefix === 'string')
-assert("locationType was not detected on your config", "locationType" in config && typeof config.locationType === 'string')
-assert("rootURL was not detected on your config", "rootURL" in config && typeof config.rootURL === 'string')
-assert("APP was not detected on your config", "APP" in config && typeof config.APP === 'object')
+assert(
+  'config is not an object',
+  typeof config === 'object' && config !== null
+);
+assert(
+  'modulePrefix was not detected on your config',
+  'modulePrefix' in config && typeof config.modulePrefix === 'string'
+);
+assert(
+  'locationType was not detected on your config',
+  'locationType' in config && typeof config.locationType === 'string'
+);
+assert(
+  'rootURL was not detected on your config',
+  'rootURL' in config && typeof config.rootURL === 'string'
+);
+assert(
+  'APP was not detected on your config',
+  'APP' in config && typeof config.APP === 'object'
+);
 
 export default config as {
-  modulePrefix: string,
-  locationType: string,
-  rootURL: string,
-  APP: Record<string, unknown>
+  modulePrefix: string;
+  locationType: string;
+  rootURL: string;
+  APP: Record<string, unknown>;
 } & Record<string, unknown>;

package/files/app/templates/_js_application.gjs

@@ -2,8 +2,8 @@ import { pageTitle } from 'ember-page-title';
 <% if (welcome) {%>import { WelcomePage } from 'ember-welcome-page';<% } %>
 
 <template>
-  {{pageTitle "<%= namespace %>"}}
-  <% if (welcome) { %>
+  {{pageTitle "<%= namespace %>"}}<% if (welcome) { %>
+
   {{outlet}}
 
   {{! The following component displays Ember's default welcome message. }}

package/files/app/templates/_ts_application.gts

@@ -2,8 +2,8 @@ import { pageTitle } from 'ember-page-title';
 <% if (welcome) {%>import { WelcomePage } from 'ember-welcome-page';<% } %>
 
 <template>
-  {{pageTitle "<%= namespace %>"}}
-  <% if (welcome) { %>
+  {{pageTitle "<%= namespace %>"}}<% if (welcome) { %>
+
   {{outlet}}
 
   {{! The following component displays Ember's default welcome message. }}

package/files/package.json

@@ -31,74 +31,74 @@
     "./*": "./app/*"
   },
   "devDependencies": {
-    "@babel/core": "^7.27.1",
-    "@babel/runtime": "^7.27.1",
-    "@babel/plugin-transform-runtime": "^7.27.1<% if (typescript) { %>",
-    "@babel/plugin-transform-typescript": "^7.27.1<% } %>",
-    "@babel/eslint-parser": "^7.27.1<% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.5.0",
-    "@ember-data/graph": "~5.5.0",
-    "@ember-data/json-api": "~5.5.0",
-    "@ember-data/legacy-compat": "~5.5.0",
-    "@ember-data/model": "~5.5.0",
-    "@ember-data/request": "~5.5.0",
-    "@ember-data/request-utils": "~5.5.0",
-    "@ember-data/serializer": "~5.5.0",
-    "@ember-data/store": "~5.5.0<% } %><% if (typescript) { %>",
+    "@babel/core": "^7.28.3",
+    "@babel/runtime": "^7.28.3",
+    "@babel/plugin-transform-runtime": "^7.28.3<% if (typescript) { %>",
+    "@babel/plugin-transform-typescript": "^7.28.0<% } %>",
+    "@babel/eslint-parser": "^7.28.0<% if (typescript && emberData) { %>",
+    "@ember-data/adapter": "~5.6.0",
+    "@ember-data/graph": "~5.6.0",
+    "@ember-data/json-api": "~5.6.0",
+    "@ember-data/legacy-compat": "~5.6.0",
+    "@ember-data/model": "~5.6.0",
+    "@ember-data/request": "~5.6.0",
+    "@ember-data/request-utils": "~5.6.0",
+    "@ember-data/serializer": "~5.6.0",
+    "@ember-data/store": "~5.6.0<% } %><% if (typescript) { %>",
     "@ember/app-tsconfig": "^1.0.3<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/string": "^4.0.1",
     "@ember/test-helpers": "^5.2.2",
-    "@ember/test-waiters": "^4.1.0",
-    "@embroider/macros": "^1.18.0",
-    "@embroider/core": "^4.1.0",
-    "@embroider/vite": "^1.1.5",
-    "@embroider/compat": "^4.1.0",
-    "@embroider/router": "^3.0.1",
+    "@ember/test-waiters": "^4.1.1",
+    "@embroider/macros": "^1.18.1",
+    "@embroider/core": "^4.1.3",
+    "@embroider/vite": "^1.2.0",
+    "@embroider/compat": "^4.1.3",
+    "@embroider/router": "^3.0.3",
     "@embroider/config-meta-loader": "^1.0.0",
-    "@eslint/js": "^9.27.0",
+    "@eslint/js": "^9.34.0",
     "@glimmer/component": "^2.0.0<% if (typescript) { %>",
     "@glint/core": "^1.5.2",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
     "@glint/template": "^1.5.2<% } %>",
     "@rollup/plugin-babel": "^6.0.4<% if (typescript) { %>",
-    "@types/qunit": "^2.19.12",
+    "@types/qunit": "^2.19.13",
     "@types/rsvp": "^4.0.9<% if (emberData) {%>",
-    "@warp-drive/core-types": "~5.5.0<% }} %><% if (emberData) { %>",
-    "@warp-drive/ember": "~5.5.0<% } %>",
+    "@warp-drive/core-types": "~5.6.0<% }} %><% if (emberData) { %>",
+    "@warp-drive/ember": "~5.6.0<% } %>",
     "babel-plugin-ember-template-compilation": "^2.4.1",
-    "concurrently": "^9.1.2",
+    "concurrently": "^9.2.1",
     "decorator-transforms": "^2.3.0",
     "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.5.0-beta.0",
+    "ember-cli": "~6.6.0",
     "ember-cli-babel": "^8.2.0",
-    "ember-cli-deprecation-workflow": "^3.3.0<% if (emberData) { %>",
-    "ember-data": "~5.5.0<% } %>",
+    "ember-cli-deprecation-workflow": "^3.4.0<% if (emberData) { %>",
+    "ember-data": "~5.6.0<% } %>",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
-    "ember-page-title": "^9.0.2",
+    "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.3",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.5.0-beta.1",
-    "ember-template-lint": "^7.7.0<% if (welcome) { %>",
+    "ember-source": "~6.6.0",
+    "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.27.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-ember": "^12.5.0",
-    "eslint-plugin-n": "^17.18.0",
-    "eslint-plugin-qunit": "^8.1.2",
-    "globals": "^16.1.0",
-    "prettier": "^3.5.3",
-    "prettier-plugin-ember-template-tag": "^2.0.5",
+    "eslint": "^9.34.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-ember": "^12.7.3",
+    "eslint-plugin-n": "^17.21.3",
+    "eslint-plugin-qunit": "^8.2.5",
+    "globals": "^16.3.0",
+    "prettier": "^3.6.2",
+    "prettier-plugin-ember-template-tag": "^2.1.0",
     "qunit": "^2.24.1",
-    "qunit-dom": "^3.4.0",
-    "stylelint": "^16.19.1",
+    "qunit-dom": "^3.5.0",
+    "stylelint": "^16.23.1",
     "stylelint-config-standard": "^38.0.0",
     "testem": "^3.16.0",
     "tracked-built-ins": "^4.0.0<% if (typescript) { %>",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1<% } %>",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.41.0<% } %>",
     "vite": "^6.3.5"
   },
   "engines": {

package/files/tsconfig.json

@@ -1,31 +1,16 @@
 {
   "extends": "@ember/app-tsconfig",
-  "include": [
-    "app", "tests", "types"
-  ],
+  "include": ["app", "tests", "types"],
   "glint": {
-    "environment": [
-      "ember-loose",
-      "ember-template-imports"
-    ]
+    "environment": ["ember-loose", "ember-template-imports"]
   },
   "compilerOptions": {
     "allowJs": true,
     "paths": {
-      "<%= name %>/tests/*": [
-        "./tests/*"
-      ],
-      "<%= name %>/*": [
-        "./app/*"
-      ],
-      "*": [
-        "./types/*"
-      ]
+      "<%= name %>/tests/*": ["./tests/*"],
+      "<%= name %>/*": ["./app/*"],
+      "*": ["./types/*"]
     },
-    "types": [
-      "ember-source/types",
-      "@embroider/core/virtual",
-      "vite/client"
-    ]
-  },
+    "types": ["ember-source/types", "@embroider/core/virtual", "vite/client"]
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "0.8.1",
+  "version": "6.6.0",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -27,10 +27,10 @@
     "execa": "^9.1.0",
     "fixturify": "^3.0.0",
     "globals": "^15.3.0",
+    "jsonc-parser": "^3.3.1",
     "prettier": "^3.2.5",
     "prettier-plugin-ember-template-tag": "^2.0.2",
     "release-plan": "^0.16.0",
-    "resolve-bin": "^1.0.1",
     "strip-ansi": "^7.1.0",
     "tmp-promise": "^3.0.3",
     "vitest": "^3.1.2"

package/tests/arguments.test.mjs

@@ -0,0 +1,155 @@
+import { describe, it, expect } from 'vitest';
+
+import { parse } from 'jsonc-parser';
+import { generateApp } from './helpers.mjs';
+
+/**
+ * These tests are non-functional that are designed to test only the output of the blueprint
+ * and should never install packages or run any lints or tests
+ */
+describe('Blueprint Arguments', function () {
+  describe('--typescript', async function () {
+    it('does not generate a tsconfig if you do not pass --typescript', async function () {
+      const { files } = await generateApp();
+
+      expect(files['tsconfig.json']).to.be.undefined;
+      expect(Object.keys(files.app.templates)).toMatchInlineSnapshot(`
+        [
+          "application.gjs",
+        ]
+      `);
+    });
+
+    it('generates an app with --typescript', async function () {
+      const { files } = await generateApp({ flags: ['--typescript'] });
+
+      expect(parse(files['tsconfig.json']).extends).to.equal(
+        '@ember/app-tsconfig',
+      );
+      expect(parse(files['package.json']).scripts['lint:types']).to.not.be
+        .undefined;
+      expect(Object.keys(files.app.templates)).toMatchInlineSnapshot(`
+        [
+          "application.gts",
+        ]
+      `);
+    });
+  });
+
+  describe('--package-manager', async function () {
+    it('works with npm by default', async function () {
+      const { files } = await generateApp();
+
+      expect(parse(files['package.json']).scripts.lint).toMatchInlineSnapshot(
+        `"concurrently "npm:lint:*(!fix)" --names "lint:" --prefixColors auto"`,
+      );
+    });
+
+    it('works with --package-manager=pnpm', async function () {
+      const { files } = await generateApp({
+        flags: ['--package-manager=pnpm'],
+      });
+
+      expect(parse(files['package.json']).scripts.lint).toMatchInlineSnapshot(
+        `"concurrently "pnpm:lint:*(!fix)" --names "lint:" --prefixColors auto"`,
+      );
+    });
+
+    it('works with --pnpm in the same way as --package-manager=pnpm', async function () {
+      const { files } = await generateApp({ flags: ['--pnpm'] });
+
+      expect(parse(files['package.json']).scripts.lint).toMatchInlineSnapshot(
+        `"concurrently "pnpm:lint:*(!fix)" --names "lint:" --prefixColors auto"`,
+      );
+    });
+
+    it('works with --package-manager=yarn', async function () {
+      const { files } = await generateApp({
+        flags: ['--package-manager=yarn'],
+      });
+
+      expect(parse(files['package.json']).scripts.lint).toMatchInlineSnapshot(
+        `"concurrently "yarn:lint:*(!fix)" --names "lint:" --prefixColors auto"`,
+      );
+    });
+
+    it('works with --yarn in the same way as --package-manager=yarn', async function () {
+      const { files } = await generateApp({ flags: ['--yarn'] });
+
+      expect(parse(files['package.json']).scripts.lint).toMatchInlineSnapshot(
+        `"concurrently "yarn:lint:*(!fix)" --names "lint:" --prefixColors auto"`,
+      );
+    });
+  });
+
+  describe('--ci-provider', async function () {
+    it('uses github by default', async function () {
+      const { files } = await generateApp();
+
+      expect(files['.github'].workflows['ci.yml']).to.not.be.undefined;
+    });
+
+    it('does not generate any workflow files if --ci-provider=none is passed', async function () {
+      const { files } = await generateApp({ flags: ['--ci-provider=none'] });
+
+      expect(files['.github']).to.be.undefined;
+    });
+  });
+
+  describe('--lang', async function () {
+    it('generates an app --lang=(valid code): no message + set `lang` in index.html', async function () {
+      const { files } = await generateApp({ flags: ['--lang=eo'] });
+
+      expect(files['index.html']).to.contain('<html lang="eo">');
+    });
+  });
+
+  describe('--no-ember-data', async function () {
+    it('installs ember-data by default', async function () {
+      const { files } = await generateApp();
+
+      expect(parse(files['package.json']).devDependencies['ember-data']).to.not
+        .be.undefined;
+    });
+
+    it('does not add ember-data if you pass --no-ember-data', async function () {
+      const { files } = await generateApp({ flags: ['--no-ember-data'] });
+
+      expect(parse(files['package.json']).devDependencies['ember-data']).to.be
+        .undefined;
+    });
+  });
+
+  describe('--name', async function () {
+    it('generates an app with a specified name', async function () {
+      const { files } = await generateApp({
+        name: 'foo',
+        flags: ['--name=foo'],
+      });
+
+      expect(parse(files['package.json']).name).toBe('foo');
+    });
+  });
+
+  describe('--no-welcome', async function () {
+    it('generates an app with the welcome page component by default', async function () {
+      const { files } = await generateApp();
+
+      expect(parse(files['package.json']).devDependencies['ember-welcome-page'])
+        .to.not.be.undefined;
+      expect(files.app.templates['application.gjs']).to.contain(
+        '<WelcomePage />',
+      );
+    });
+
+    it('generates an app without the welcome page component', async function () {
+      const { files } = await generateApp({ flags: ['--no-welcome'] });
+
+      expect(parse(files['package.json']).devDependencies['ember-welcome-page'])
+        .to.be.undefined;
+      expect(files.app.templates['application.gjs']).not.to.contain(
+        '<WelcomePage />',
+      );
+    });
+  });
+});

package/tests/fixtures/tests-js-10/app/components/sweet.gjs

@@ -0,0 +1,3 @@
+<template>
+  {{yield}}
+</template>

package/tests/{fixture → fixtures/tests-js-10}/app/router.js

@@ -1,4 +1,4 @@
-import EmberRouter from '@ember/routing/router';
+import EmberRouter from '@embroider/router';
 import config from 'test-app/config/environment';
 
 export default class Router extends EmberRouter {
@@ -7,6 +7,5 @@ export default class Router extends EmberRouter {
 }
 
 Router.map(function () {
-  this.route('styles');
-  this.route('custom-component');
+  this.route('fancy');
 });

package/tests/{fixture/app/routes/styles.js → fixtures/tests-js-10/app/routes/fancy.js}

@@ -1,6 +1,6 @@
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
-export default class StylesRoute extends Route {
+export default class FancyRoute extends Route {
   @service router;
 }

package/tests/fixtures/tests-js-10/app/styles/app.css

@@ -0,0 +1,3 @@
+.purple {
+  color: rebeccapurple;
+}

package/tests/fixtures/tests-js-10/app/templates/application.gjs

@@ -0,0 +1,15 @@
+import { pageTitle } from 'ember-page-title';
+import { WelcomePage } from 'ember-welcome-page';
+import { LinkTo } from '@ember/routing';
+
+<template>
+  {{pageTitle "TestApp"}}
+
+  {{outlet}}
+
+  {{! The following component displays Ember's default welcome message. }}
+  <WelcomePage />
+  {{! Feel free to remove this! }}
+
+  <LinkTo @route="fancy" data-test-a>Fancy</LinkTo>
+</template>

package/tests/fixtures/tests-js-10/app/templates/fancy.gjs

@@ -0,0 +1,12 @@
+import { pageTitle } from 'ember-page-title';
+import Sweet from '../components/sweet.gjs';
+
+<template>
+  {{pageTitle "Fancy"}}
+
+  <Sweet />
+
+  <p class="purple">Fancy</p>
+
+  {{outlet}}
+</template>

package/tests/fixtures/tests-js-10/tests/acceptance/index-test.js

@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, click } from '@ember/test-helpers';
+import { setupApplicationTest } from 'test-app/tests/helpers';
+
+module('Acceptance | index', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /', async function (assert) {
+    await visit('/');
+
+    assert.strictEqual(currentURL(), '/');
+
+    await click('[data-test-a]');
+
+    assert.strictEqual(currentURL(), '/fancy');
+
+    assert.dom('p').hasText('Fancy');
+
+    assert.dom('p.purple').hasStyle(
+      {
+        'color': 'rgb(102, 51, 153)',
+      },
+      'The text should be purple if the app styles are working correctly',
+    )
+  });
+});

package/tests/fixtures/tests-js-10/tests/integration/components/sweet-test.gjs

@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'test-app/tests/helpers';
+import { render } from '@ember/test-helpers';
+import Sweet from 'test-app/components/sweet';
+
+module('Integration | Component | sweet', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Updating values is achieved using autotracking, just like in app code. For example:
+    // class State { @tracked myProperty = 0; }; const state = new State();
+    // and update using state.myProperty = 1; await rerender();
+    // Handle any actions with function myAction(val) { ... };
+
+    await render(<template><Sweet /></template>);
+
+    assert.dom().hasText('');
+
+    // Template block usage:
+    await render(<template>
+      <Sweet>
+        template block text
+      </Sweet>
+    </template>);
+
+    assert.dom().hasText('template block text');
+  });
+});

package/tests/fixtures/tests-js-10/tests/routes/fancy-test.js

@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'test-app/tests/helpers';
+
+module('Unit | Route | fancy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:fancy');
+    assert.ok(route);
+  });
+});