@ember/app-blueprint 7.2.0-alpha.1 → 7.2.0-beta.1

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

@@ -48,7 +48,7 @@ jobs:
         name: Create Prepare Release PR
         with:
           commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
-          labels: "internal"
+          labels: internal, ignore
           sign-commits: true
           branch: release-preview
           title: Prepare Alpha Release ${{ steps.explanation.outputs.new-version }}

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

@@ -48,7 +48,7 @@ jobs:
         name: Create Prepare Release PR
         with:
           commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
-          labels: "internal"
+          labels: internal, ignore
           sign-commits: true
           branch: release-preview-beta
           title: Prepare Beta Release ${{ steps.explanation.outputs.new-version }}

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

@@ -48,7 +48,7 @@ jobs:
         name: Create Prepare Release PR
         with:
           commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
-          labels: "internal"
+          labels: internal, ignore
           sign-commits: true
           branch: release-preview-stable
           title: Prepare Stable Release ${{ steps.explanation.outputs.new-version }}

package/.github/workflows/publish.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v5
       - uses: actions/setup-node@v6
         with:
           node-version: 24

package/.release-plan.json

@@ -2,17 +2,29 @@
   "solution": {
     "@ember/app-blueprint": {
       "impact": "minor",
-      "oldVersion": "7.2.0-alpha.0",
-      "newVersion": "7.2.0-alpha.1",
-      "tagName": "alpha",
+      "oldVersion": "7.2.0-beta.0",
+      "newVersion": "7.2.0-beta.1",
+      "tagName": "beta",
       "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"
         }
       ],
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2026-05-21)\n\n* @ember/app-blueprint 7.2.0-alpha.1 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n  * [#288](https://github.com/ember-cli/ember-app-blueprint/pull/288) Prepare 7.2 Alpha ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
+  "description": "## Release (2026-07-03)\n\n* @ember/app-blueprint 7.2.0-beta.1 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n  * [#303](https://github.com/ember-cli/ember-app-blueprint/pull/303) Prepare 7.2 Beta ([@mansona](https://github.com/mansona))\n  * [#147](https://github.com/ember-cli/ember-app-blueprint/pull/147) Apply `typescript-eslint`'s recommended config to gts files ([@bendemboski](https://github.com/bendemboski))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#299](https://github.com/ember-cli/ember-app-blueprint/pull/299) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n  * [#300](https://github.com/ember-cli/ember-app-blueprint/pull/300) Update RELEASE.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n  * [#298](https://github.com/ember-cli/ember-app-blueprint/pull/298) fix plan release for beta and stable ([@mansona](https://github.com/mansona))\n  * [#297](https://github.com/ember-cli/ember-app-blueprint/pull/297) fix release-plan plan CI ([@mansona](https://github.com/mansona))\n  * [#291](https://github.com/ember-cli/ember-app-blueprint/pull/291) update release-plan ([@mansona](https://github.com/mansona))\n  * [#281](https://github.com/ember-cli/ember-app-blueprint/pull/281) Update RELEASE.md ([@mansona](https://github.com/mansona))\n\n#### Committers: 2\n- Ben Demboski ([@bendemboski](https://github.com/bendemboski))\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
 }

package/CHANGELOG.md

@@ -1,23 +1,51 @@
 # Changelog
 
-## Release (2026-05-21)
+## Release (2026-07-03)
 
-* @ember/app-blueprint 7.2.0-alpha.1 (minor)
+* @ember/app-blueprint 7.2.0-beta.1 (minor)
 
 #### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#288](https://github.com/ember-cli/ember-app-blueprint/pull/288) Prepare 7.2 Alpha ([@mansona](https://github.com/mansona))
+  * [#303](https://github.com/ember-cli/ember-app-blueprint/pull/303) Prepare 7.2 Beta ([@mansona](https://github.com/mansona))
+  * [#147](https://github.com/ember-cli/ember-app-blueprint/pull/147) Apply `typescript-eslint`'s recommended config to gts files ([@bendemboski](https://github.com/bendemboski))
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#299](https://github.com/ember-cli/ember-app-blueprint/pull/299) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
+
+#### :memo: Documentation
+* `@ember/app-blueprint`
+  * [#300](https://github.com/ember-cli/ember-app-blueprint/pull/300) Update RELEASE.md ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#298](https://github.com/ember-cli/ember-app-blueprint/pull/298) fix plan release for beta and stable ([@mansona](https://github.com/mansona))
+  * [#297](https://github.com/ember-cli/ember-app-blueprint/pull/297) fix release-plan plan CI ([@mansona](https://github.com/mansona))
+  * [#291](https://github.com/ember-cli/ember-app-blueprint/pull/291) update release-plan ([@mansona](https://github.com/mansona))
+  * [#281](https://github.com/ember-cli/ember-app-blueprint/pull/281) Update RELEASE.md ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Ben Demboski ([@bendemboski](https://github.com/bendemboski))
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2026-07-02)
+
+* @ember/app-blueprint 7.1.1 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#299](https://github.com/ember-cli/ember-app-blueprint/pull/299) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
 
 #### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
 
-## Release (2026-05-20)
+## Release (2026-06-30)
 
-* @ember/app-blueprint 7.1.0-beta.1 (minor)
+* @ember/app-blueprint 7.1.0 (minor)
 
 #### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#286](https://github.com/ember-cli/ember-app-blueprint/pull/286) Prepare Beta Release ([@mansona](https://github.com/mansona))
+  * [#295](https://github.com/ember-cli/ember-app-blueprint/pull/295) Promote Beta and update all dependencies for 7.1 release ([@mansona](https://github.com/mansona))
   * [#266](https://github.com/ember-cli/ember-app-blueprint/pull/266) remove chalk in favour of native styleText ([@mansona](https://github.com/mansona))
   * [#267](https://github.com/ember-cli/ember-app-blueprint/pull/267) update walk-sync to v4 ([@mansona](https://github.com/mansona))
   * [#260](https://github.com/ember-cli/ember-app-blueprint/pull/260) update stylelint to v17 ([@mansona](https://github.com/mansona))
@@ -33,6 +61,8 @@
 
 #### :house: Internal
 * `@ember/app-blueprint`
+  * [#298](https://github.com/ember-cli/ember-app-blueprint/pull/298) fix plan release for beta and stable ([@mansona](https://github.com/mansona))
+  * [#297](https://github.com/ember-cli/ember-app-blueprint/pull/297) fix release-plan plan CI ([@mansona](https://github.com/mansona))
   * [#253](https://github.com/ember-cli/ember-app-blueprint/pull/253) Update RELEASE.md with notes from the latest release ([@mansona](https://github.com/mansona))
 
 #### Committers: 2

package/RELEASE.md

@@ -46,21 +46,24 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
   - **make sure to not update the CHANGELOG.md file** so as not to include the beta or alpha changelogs in the next release
   - make sure to not update the version in the package.json during this step, this will be release-plan's job
   - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
+  - commit this merge
 - Update blueprint dependencies to latest
 
   ```
-  pnpm dlx update-blueprint-deps --filter 'ember-source' --tag latest files/package.json
+  pnpm dlx update-blueprint-deps --filter 'ember-source' --tag latest package.json files/package.json
   pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
   ```
 
 - commit this update `git commit -am "update blueprint dependencies to latest"`
-- push and open a PR targeting `release` with a PR title like `Update all dependencies for 6.4 release`
-- mark this PR as an `enhancement` if it is a minor release
+- push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release`
+- mark this PR as an `enhancement` if it is a minor release, or `breaking` if it is a major release
 - check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
 - merge branch
 - check that the `Prepare Release` PR has been correctly opened by `release-plan`
+- review the included PRs in the changelog and add `ignore` to things that shouldn't be there
+- after adding any `ignore` labels, wait for the `Prepare Release` PR to be updated
 - Merge the `Prepare Release` branch when you are ready to release
-- Check the `Release Stable` GitHub action to make sure the release succeeded
+- Check the `Publish` GitHub action to make sure the release succeeded
 
 ### Release ember-cli and update that dependency
 
@@ -73,6 +76,7 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
   ```
   pnpm dlx update-blueprint-deps --filter ember-cli --tag latest package.json files/package.json
   ```
+- run `pnpm install` to make sure that the pnpm-lock is updated
 - commit this update `git commit -am "update ember-cli dependency to latest"`
 - push and open a PR targeting `release` with a PR title like `Update ember-cli to 6.4`
 - mark this PR as a `bug` to make sure it goes out in a patch release
@@ -108,9 +112,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
   pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
   ```
 
+- run `pnpm install` to install any updated packages
 - commit this update `git commit -am "update blueprint dependencies to beta"`
 - push and open a PR targeting `beta` with a PR title like `Prepare 6.5-beta`
-- mark this PR as an `enchancement` if the next beta is a minor release
+- mark this PR as an `enchancement`
 - check that everything is ok i.e. CI passes
 - merge the `merge-release` branch into `beta` in GitHub
 - check that the `Prepare Beta Release` PR has been correctly opened by `release-plan`
@@ -141,7 +146,7 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
 
 - commit this update `git commit -am "update blueprint dependencies to alpha"`
 - push and open a PR targeting `main` with a PR title like `Prepare 6.6-alpha`
-- mark this PR as an `enchancement` if the next alpha is a minor release
+- mark this PR as an `enchancement`
 - check that everything is ok i.e. CI passes
 - merge the `merge-beta` branch into `main` in GitHub
 - check that the `Prepare Alpha Release` PR has been correctly opened by `release-plan`
@@ -183,3 +188,6 @@ If you want to change the content of the Changelog then you should update the PR
 ## Patch Releases
 
 Now that we're using release-plan for all releases, patch releases have become super easy! Every time you merge a PR to any branch that is being released with `release-plan` a new `Prepare Release` PR will be created. When you merge this `Prepare Release` branch it will automatically release the new Patch version.
+
+> [!NOTE]
+> If you merge a patch into any branch other than main, you **must** merge all branches forward i.e. release -> beta -> main so that the change gets applied to all branches correctly. For example: if you update a dependency on the `release` branch, you should then create a branch from `beta` and merge `release` into that branch and open a PR with this change to target `beta`. The same should happen from `beta` to `main`. 

package/conditional-files/_ts_eslint.config.mjs

@@ -83,7 +83,15 @@ export default defineConfig([
         ...globals.browser,
       },
     },
-    extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
+    extends: [
+      ...ts.configs.recommendedTypeChecked,
+      // https://github.com/ember-cli/ember-addon-blueprint/issues/119
+      {
+        ...ts.configs.eslintRecommended,
+        files: undefined,
+      },
+      ember.configs.gts,
+    ],
   },
   {
     ...qunit.configs.recommended,

package/files/package.json

@@ -31,29 +31,29 @@
     "./*": "./app/*"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.0",
-    "@babel/runtime": "^7.29.2",
-    "@babel/plugin-transform-runtime": "^7.29.0<% if (typescript) { %>",
-    "@babel/plugin-transform-typescript": "^7.28.6<% } %>",
-    "@babel/eslint-parser": "^7.28.6<% if (typescript) { %>",
+    "@babel/core": "^7.29.7",
+    "@babel/runtime": "^7.29.7",
+    "@babel/plugin-transform-runtime": "^7.29.7<% if (typescript) { %>",
+    "@babel/plugin-transform-typescript": "^7.29.7<% } %>",
+    "@babel/eslint-parser": "^7.29.7<% if (typescript) { %>",
     "@ember/app-tsconfig": "^2.0.0<% } %>",
     "@ember/optional-features": "^3.0.0",
     "@ember/string": "^4.0.1",
-    "@ember/test-helpers": "^5.4.2",
-    "@ember/test-waiters": "^4.1.1",
-    "@embroider/macros": "^1.20.2",
-    "@embroider/core": "^4.4.7",
-    "@embroider/vite": "^1.7.2",
-    "@embroider/compat": "^4.1.18",
+    "@ember/test-helpers": "^5.4.3",
+    "@ember/test-waiters": "^4.1.2",
+    "@embroider/macros": "^1.20.5",
+    "@embroider/core": "^4.6.2",
+    "@embroider/vite": "^1.7.8",
+    "@embroider/compat": "^4.1.21",
     "@embroider/router": "^3.0.6",
     "@embroider/config-meta-loader": "^1.0.0",
     "@embroider/legacy-inspector-support": "^0.1.3",
     "@eslint/js": "^9.39.4",
     "@glimmer/component": "^2.1.1<% if (typescript) { %>",
-    "@glint/ember-tsc": "^1.5.0",
-    "@glint/template": "^1.7.7",
-    "@glint/tsserver-plugin": "^2.4.0<% } %>",
-    "@rollup/plugin-babel": "^7.0.0<% if (typescript) { %>",
+    "@glint/ember-tsc": "^1.8.2",
+    "@glint/template": "^1.7.8",
+    "@glint/tsserver-plugin": "^2.5.8<% } %>",
+    "@rollup/plugin-babel": "^7.1.0<% if (typescript) { %>",
     "@types/qunit": "^2.19.14",
     "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
     "@warp-drive/core": "~5.8.2",
@@ -62,17 +62,17 @@
     "@warp-drive/legacy": "~5.8.2",
     "@warp-drive/utilities": "~5.8.2<% } %>",
     "babel-plugin-ember-template-compilation": "^4.0.0",
-    "concurrently": "^9.2.1",
-    "decorator-transforms": "^2.3.2",
-    "ember-cli": "~7.0.0",
+    "concurrently": "^9.2.3",
+    "decorator-transforms": "^2.4.0",
+    "ember-cli": "~7.1.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-deprecation-workflow": "^4.0.1",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.3.0",
     "ember-page-title": "^9.0.3",
-    "ember-qunit": "^9.0.4",
+    "ember-qunit": "^9.1.0",
     "ember-resolver": "^13.2.0",
-    "ember-source": "~7.2.0-alpha.1",
+    "ember-source": "~7.2.0-beta.1",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^8.0.5<% } %>",
     "eslint": "^9.39.4",
@@ -82,16 +82,16 @@
     "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>",
     "eslint-plugin-warp-drive": "^5.8.2<% } %>",
     "globals": "^16.5.0",
-    "prettier": "^3.8.3",
+    "prettier": "^3.8.4",
     "prettier-plugin-ember-template-tag": "^2.1.6",
-    "qunit": "^2.25.0",
+    "qunit": "^2.26.0",
     "qunit-dom": "^3.5.1",
-    "stylelint": "^17.11.0",
+    "stylelint": "^17.14.0",
     "stylelint-config-standard": "^40.0.0",
-    "testem": "^3.20.0<% if (typescript) { %>",
+    "testem": "^3.20.1<% if (typescript) { %>",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.59.3<% } %>",
-    "vite": "^8.0.12"
+    "typescript-eslint": "^8.62.0<% } %>",
+    "vite": "^8.1.0"
   },
   "engines": {
     "node": ">= 20.19.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-beta.1",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -12,46 +12,46 @@
   "license": "MIT",
   "author": "",
   "main": "index.js",
-  "release-plan": {
-    "semverIncrementAs": {
-      "minor": "prerelease",
-      "patch": "prerelease"
-    },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
-  },
   "dependencies": {
     "ejs": "^3.1.10",
     "ember-cli-string-utils": "^1.1.0",
     "lodash": "^4.18.1",
-    "sort-package-json": "^3.6.1",
-    "walk-sync": "^4.0.1"
+    "sort-package-json": "^3.7.1",
+    "walk-sync": "^4.0.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.4",
-    "concurrently": "^9.2.1",
-    "ember-cli": "^7.0.0",
+    "concurrently": "^9.2.3",
+    "ember-cli": "^7.1.0",
     "eslint": "9.x",
     "eslint-config-prettier": "^9.1.2",
     "execa": "^9.6.1",
     "fixturify": "^3.0.0",
     "globals": "^15.15.0",
     "jsonc-parser": "^3.3.1",
-    "prettier": "^3.8.3",
+    "prettier": "^3.8.4",
     "prettier-plugin-ember-template-tag": "^2.1.6",
-    "release-plan": "^0.17.4",
+    "release-plan": "^0.18.0",
     "strip-ansi": "^7.2.0",
     "tmp-promise": "^3.0.3",
-    "vitest": "^4.1.6",
+    "vitest": "^4.1.9",
     "vitest-matrix": "^0.2.0"
   },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
+  },
   "scripts": {
+    "format": "prettier . --write",
     "lint": "concurrently 'pnpm:lint:*(!fix)'",
-    "lint:fix": "pnpm lint:eslint && pnpm format",
     "lint:eslint": "eslint .",
+    "lint:fix": "pnpm lint:eslint && pnpm format",
     "lint:prettier": "prettier . --check",
-    "format": "prettier . --write",
-    "test": "vitest",
-    "new:app": "pnpm dlx ember-cli@latest new my-app --blueprint ."
+    "new:app": "pnpm dlx ember-cli@latest new my-app --blueprint .",
+    "test": "vitest"
   }
 }

package/tests/fixtures/lint-ts/app/lint-test-gts.gts

@@ -0,0 +1,15 @@
+/**
+ * This file is used to ensure that `eslint.config.mjs` is properly configured
+ * to apply `typescript-eslint`'s recommended rules to `.gts` files. It ensures
+ * that:
+ *
+ * - `no-undef` is disabled (otherwise the undefined symbol would cause a
+ *   linting error)
+ * - `@typescript-eslint/no-unsafe-return` is enabled (otherwise the
+ *   `eslint-disable-next-line` comment would cause a linting error)
+ */
+export default function () {
+  // @ts-expect-error testing lint
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return notDefined;
+}

package/tests/fixtures/lint-ts/app/lint-test-ts.ts

@@ -0,0 +1,15 @@
+/**
+ * This file is used to ensure that `eslint.config.mjs` is properly configured
+ * to apply `typescript-eslint`'s recommended rules to `.ts` files. It ensures
+ * that:
+ *
+ * - `no-undef` is disabled (otherwise the undefined symbol would cause a
+ *   linting error)
+ * - `@typescript-eslint/no-unsafe-return` is enabled (otherwise the
+ *   `eslint-disable-next-line` comment would cause a linting error)
+ */
+export default function () {
+  // @ts-expect-error testing lint
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return notDefined;
+}

package/tests/lint.test.mjs

@@ -1,6 +1,7 @@
 import { beforeAll, describe, it, expect } from 'vitest';
 
 import { generateApp } from './helpers.mjs';
+import fixturify from 'fixturify';
 
 describe('linting & formatting', function () {
   describe('JavaScript', function () {
@@ -39,6 +40,11 @@ describe('linting & formatting', function () {
         flags: ['--typescript', '--pnpm'],
         skipNpm: false,
       });
+
+      fixturify.writeSync(
+        app.dir,
+        fixturify.readSync('./tests/fixtures/lint-ts'),
+      );
     });
 
     it('yields output without errors', async function (context) {