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

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,21 @@
   "solution": {
     "@ember/app-blueprint": {
       "impact": "minor",
-      "oldVersion": "7.2.0-alpha.0",
-      "newVersion": "7.2.0-alpha.1",
+      "oldVersion": "7.2.0-alpha.1",
+      "newVersion": "7.2.0-alpha.2",
       "tagName": "alpha",
       "constraints": [
         {
           "impact": "minor",
           "reason": "Appears in changelog section :rocket: Enhancement"
+        },
+        {
+          "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-06-30)\n\n* @ember/app-blueprint 7.2.0-alpha.2 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\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#### :house: Internal\n* `@ember/app-blueprint`\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,5 +1,22 @@
 # Changelog
 
+## Release (2026-06-30)
+
+* @ember/app-blueprint 7.2.0-alpha.2 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#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))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#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-05-21)
 
 * @ember/app-blueprint 7.2.0-alpha.1 (minor)

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
 
@@ -108,9 +111,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 +145,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 +187,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-alpha.2",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -12,14 +12,6 @@
   "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",
@@ -39,19 +31,27 @@
     "jsonc-parser": "^3.3.1",
     "prettier": "^3.8.3",
     "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-matrix": "^0.2.0"
   },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
+  },
   "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) {