Promote 6.12 to beta and update dependencies

.github/workflows/ci.yml

@@ -3,9 +3,11 @@ name: CI
 on:
   workflow_dispatch:
   pull_request:
+    paths-ignore:
+      - '**.md'
   push:
     paths-ignore:
-      - '**/*.md'
+      - '**.md'
     branches:
       - main
 

.github/workflows/publish.yml

@@ -11,6 +11,7 @@ on:
       - master
       - release
       - beta
+      - v-*
     paths:
       - '.release-plan.json'
 
@@ -41,12 +42,12 @@ jobs:
         # pass --github-prerelease when we are only branch other than release
         # pass --publish-branch=<branch-name> when we are on a branch other than master/main
         run: |
-          if [ ${{ github.ref }} = "refs/heads/release" ]; then
-            pnpm release-plan publish --publish-branch=release
-          elif [ ${{ github.ref }} = "refs/heads/beta" ]; then
+          if [ ${{ github.ref }} = "refs/heads/beta" ]; then
             pnpm release-plan publish --github-prerelease --publish-branch=beta
-          else
+          elif [ ${{ github.ref }} = "refs/heads/main" ]; then
             pnpm release-plan publish --github-prerelease
+          else
+            pnpm release-plan publish --publish-branch=${{github.ref_name}}
           fi
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}

.prettierrc.mjs

@@ -0,0 +1,3 @@
+export default {
+  singleQuote: true,
+};

CHANGELOG.md

@@ -1,65 +1,68 @@
 # Changelog
 
-## Release (2026-02-11)
+## Release (2026-03-03)
 
-* @ember/app-blueprint 6.11.0-beta.3 (patch)
+* @ember/app-blueprint 6.11.2 (patch)
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))
+  * [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
 
-#### :house: Internal
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2026-03-01)
+
+* @ember/app-blueprint 6.11.1 (patch)
+
+#### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#219](https://github.com/ember-cli/ember-app-blueprint/pull/219) Merge release into beta ([@mansona](https://github.com/mansona))
-  * [#218](https://github.com/ember-cli/ember-app-blueprint/pull/218) Prepare Stable Release v6.10.4 ([@github-actions[bot]](https://github.com/apps/github-actions))
-  * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
+  * [#226](https://github.com/ember-cli/ember-app-blueprint/pull/226) fix decorator-transforms runtime path in babel.config.mjs ([@mansona](https://github.com/mansona))
 
-#### Committers: 3
+#### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
-- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))
-- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
 
-## Release (2026-01-24)
+## Release (2026-02-17)
 
-* @ember/app-blueprint 6.11.0-beta.2 (patch)
+* @ember/app-blueprint 6.11.0 (minor)
 
-#### :bug: Bug Fix
+#### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))
+  * [#222](https://github.com/ember-cli/ember-app-blueprint/pull/222) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona))
 
 #### :house: Internal
 * `@ember/app-blueprint`
-  * [#206](https://github.com/ember-cli/ember-app-blueprint/pull/206) Merge release into beta ([@mansona](https://github.com/mansona))
-  * [#201](https://github.com/ember-cli/ember-app-blueprint/pull/201) Prepare Stable Release v6.10.3 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
 
-#### Committers: 3
+#### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
-- Edward Faulkner ([@ef4](https://github.com/ef4))
-- [@github-actions[bot]](https://github.com/apps/github-actions)
 
-## Release (2026-01-23)
+## Release (2026-02-09)
 
-* @ember/app-blueprint 6.11.0-beta.1 (minor)
-
-#### :rocket: Enhancement
-* `@ember/app-blueprint`
-  * [#190](https://github.com/ember-cli/ember-app-blueprint/pull/190) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))
+* @ember/app-blueprint 6.10.4 (patch)
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#197](https://github.com/ember-cli/ember-app-blueprint/pull/197) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
-  * [#195](https://github.com/ember-cli/ember-app-blueprint/pull/195) add sort-package-json as a dependency ([@mansona](https://github.com/mansona))
+  * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))
 
-#### :memo: Documentation
+#### :house: Internal
 * `@ember/app-blueprint`
-  * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
+  * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
 
-#### :house: Internal
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
+
+## Release (2026-01-23)
+
+* @ember/app-blueprint 6.10.3 (patch)
+
+#### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#199](https://github.com/ember-cli/ember-app-blueprint/pull/199) Prepare 6.11 Beta ([@mansona](https://github.com/mansona))
+  * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))
 
 #### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
+- Edward Faulkner ([@ef4](https://github.com/ef4))
 
 ## Release (2026-01-23)
 

RELEASE.md

@@ -19,7 +19,8 @@ The release process during release week should look like this:
 - Wait for `ember-source` to be released first
 - Merge any outstanding `Prepare Alpha Release` branches
 - Do an intial stable release from the `release` branch
-- update the dependency on `ember-cli` to point at this release and go through the release process there
+- do the initial stable release on the `ember-cli/ember-cli` repo
+- update the ember-cli dependency on this repo and continue the release process here
 - Merge `release` into `beta`
 - Do a `beta` release
 - Merge `beta` into `main`
@@ -60,6 +61,28 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
 - Merge the `Prepare Release` branch when you are ready to release
 - Check the `Release Stable` GitHub action to make sure the release succeeded
 
+### Release ember-cli and update that dependency
+
+- Go to the [ember-cli release process](https://github.com/ember-cli/ember-cli/blob/master/RELEASE.md) and complete the initial stable release
+- Make sure that the ember-cli release process is completed and the new stabel release is on npm before continuing here
+- fetch latest from origin `git fetch`
+- create a new branch to update the ember-cli dependency e.g. `git checkout --no-track -b update-ember-cli origin/release`
+- Update ember-cli
+
+  ```
+  pnpm dlx update-blueprint-deps --filter ember-cli --tag latest files/package.json
+  ```
+- 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
+- check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
+- merge the PR
+- check that the `Prepare Release` PR has been correctly opened by `release-plan`
+  - note: if there are a lot of unrelated PRs (e.g. for previous releases) that you don't want in the release notes you can add the `ignore` label to them
+- Merge the `Prepare Release` branch when you are ready to release
+- Check the `Release Stable` GitHub action to make sure the release succeeded
+
+
 ### Beta release from the `beta` branch
 
 - fetch latest from origin `git fetch`
@@ -70,11 +93,13 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
   - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release
   - make sure to not update the version in the package.json during this step, that step comes later
   - make sure to not remove the `release-plan` config section of the the `package.json` during this step.
+  - commit this merge
 - merge master into this new branch too e.g. `git merge origin/main --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
   - **make sure to not update the CHANGELOG.md file** in this step. It should match the changelog on `origin/release` at this stage.
   - update the alpha version in package.json to be a beta i.e. if the incoming merge is `"version": "6.6.0-alpha.3",` update it to `"version": "6.6.0-beta.0",`
   - make sure not to update the `release-plan` config in `package.json`
+  - commit this merge
 - Update blueprint dependencies to beta
 
   ```
@@ -88,6 +113,7 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
 - merge the `merge-release` branch into `beta` in GitHub
 - check that the `Prepare Beta Release` PR has been correctly opened by `release-plan`
   - note: the release-plan config will automatically make this version a pre-release
+  - note: if there are a lot of PRs for previous releases that you don't want in the release notes you can add the `ignore` label to them
 - Merge the `Prepare Beta Release` when you are ready to release the next beta version
 - Check the `Release Beta` GitHub action to make sure the release succeeded
 
@@ -116,6 +142,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
 - 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`
+  - note: the release-plan config will automatically make this version a pre-release
+  - note: if there are a lot of PRs for previous releases that you don't want in the release notes you can add the `ignore` label to them
 - Merge the `Prepare Alpha Release` when you are ready to release the next alpha version
 - Check the `Release Alpha` GitHub action to make sure the release succeeded
 

conditional-files/_js_babel.config.mjs

@@ -22,7 +22,9 @@ export default {
       'module:decorator-transforms',
       {
         runtime: {
-          import: import.meta.resolve('decorator-transforms/runtime-esm'),
+          import: fileURLToPath(
+            import.meta.resolve('decorator-transforms/runtime-esm'),
+          ),
         },
       },
     ],

conditional-files/_js_eslint.config.mjs

@@ -60,6 +60,7 @@ export default defineConfig([
     },
   },
   {
+    ...qunit.configs.recommended,
     files: ['tests/**/*-test.{js,gjs}'],
     plugins: {
       qunit,
@@ -69,7 +70,8 @@ export default defineConfig([
    * CJS node files
    */
   {
-    files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
+    ...n.configs['flat/recommended-script'],
+    files: ['**/*.cjs', 'config/**/*.js'],
     plugins: {
       n,
     },
@@ -86,6 +88,7 @@ export default defineConfig([
    * ESM node files
    */
   {
+    ...n.configs['flat/recommended-module'],
     files: ['**/*.mjs'],
     plugins: {
       n,

conditional-files/_ts_babel.config.mjs

@@ -30,7 +30,9 @@ export default {
       'module:decorator-transforms',
       {
         runtime: {
-          import: import.meta.resolve('decorator-transforms/runtime-esm'),
+          import: fileURLToPath(
+            import.meta.resolve('decorator-transforms/runtime-esm'),
+          ),
         },
       },
     ],

conditional-files/_ts_eslint.config.mjs

@@ -12,6 +12,9 @@
  *     npx eslint --inspect-config
  *
  */
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
 import globals from 'globals';
 import js from '@eslint/js';
 import { defineConfig, globalIgnores } from 'eslint/config';
@@ -35,7 +38,7 @@ const parserOptions = {
     },
     ts: {
       projectService: true,
-      tsconfigRootDir: import.meta.dirname,
+      tsconfigRootDir: dirname(fileURLToPath(import.meta.url)),
     },
   },
 };
@@ -76,10 +79,14 @@ export default defineConfig([
     languageOptions: {
       parser: ember.parser,
       parserOptions: parserOptions.esm.ts,
+      globals: {
+        ...globals.browser,
+      },
     },
     extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
   },
   {
+    ...qunit.configs.recommended,
     files: ['tests/**/*-test.{js,gjs,ts,gts}'],
     plugins: {
       qunit,
@@ -89,7 +96,8 @@ export default defineConfig([
    * CJS node files
    */
   {
-    files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
+    ...n.configs['flat/recommended-script'],
+    files: ['**/*.cjs', 'config/**/*.js'],
     plugins: {
       n,
     },
@@ -106,6 +114,7 @@ export default defineConfig([
    * ESM node files
    */
   {
+    ...n.configs['flat/recommended-module'],
     files: ['**/*.mjs'],
     plugins: {
       n,

eslint.config.mjs

@@ -9,7 +9,7 @@ export default [
   },
   {
     files: [
-      'files/*/app/**/*.js',
+      'files/app/**/*.js',
       'files-override/**/*.mjs',
       'files-override/*/app/**/*.js',
       'files-override/*/tests/**/*.js',
@@ -27,7 +27,7 @@ export default [
   {
     ignores: [
       'tests/fixtures/*',
-      'files/ember-cli-build.js',
+      'files/ember-cli-build.mjs',
       'conditional-files/_js_*',
       'conditional-files/_ts_*',
     ],

files/.prettierrc.mjs

@@ -1,36 +1,11 @@
 export default {
   plugins: ['prettier-plugin-ember-template-tag'],
-  singleQuote: true,
   overrides: [
     {
-      files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
-      options: {
-        trailingComma: 'es5',
-      },
-    },
-    {
-      files: ['*.html'],
-      options: {
-        singleQuote: false,
-      },
-    },
-    {
-      files: ['*.json'],
-      options: {
-        singleQuote: false,
-      },
-    },
-    {
-      files: ['*.hbs'],
-      options: {
-        singleQuote: false,
-      },
-    },
-    {
-      files: ['*.gjs', '*.gts'],
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
       options: {
+        singleQuote: true,
         templateSingleQuote: false,
-        trailingComma: 'es5',
       },
     },
   ],