@ember/app-blueprint 6.10.3 → 6.10.4

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

@@ -8,85 +8,50 @@ on:
     types:
       - labeled
       - unlabeled
-    branches:
-      - main
 
 concurrency:
   group: plan-release-alpha # only the latest one of these should ever be running
   cancel-in-progress: true
 
 jobs:
-  is-this-a-release:
-    name: "Is this a release?"
+  should-run-release-plan-prepare:
+    name: Should we run release-plan prepare?
     runs-on: ubuntu-latest
     outputs:
-      command: ${{ steps.check-release.outputs.command }}
-
+      should-prepare: ${{ steps.should-prepare.outputs.should-prepare }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: release-plan/actions/should-prepare-release@v1
         with:
-          fetch-depth: 2
           ref: 'main'
-      # This will only cause the `is-this-a-release` job to have a "command" of `release`
-      # when the .release-plan.json file was changed on the last commit.
-      - id: check-release
-        run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
+        id: should-prepare
 
   create-prepare-release-pr:
     name: Create Prepare Release PR
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: is-this-a-release
+    needs: should-run-release-plan-prepare
     permissions:
       contents: write
       issues: read
       pull-requests: write
-    # only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing)
-    # only run on labeled event if the PR has already been merged
-    if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)
-
+    if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true'
     steps:
-      - uses: actions/checkout@v4
-        # We need to download lots of history so that
-        # github-changelog can discover what's changed since the last release
+      - uses: release-plan/actions/prepare@v1
+        name: Run release-plan prepare
         with:
-          fetch-depth: 0
           ref: 'main'
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: "Generate Explanation and Prep Changelogs"
-        id: explanation
-        run: |
-          set +e
-          pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
-
-          if [ $? -ne 0 ]; then
-            release_plan_output=$(cat release-plan-stderr.txt)
-          else
-            release_plan_output=$(jq .description .release-plan.json -r)
-            rm release-plan-stderr.txt
-
-            if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then
-              new_version=$(jq -r '.solution[].newVersion' .release-plan.json)
-              echo "new_version=v$new_version" >> $GITHUB_OUTPUT
-            fi
-          fi
-            echo 'text<<EOF' >> $GITHUB_OUTPUT
-          echo "$release_plan_output" >> $GITHUB_OUTPUT
-            echo 'EOF' >> $GITHUB_OUTPUT
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
+        id: explanation
 
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v8
+        name: Create Prepare Release PR
         with:
-          commit-message: "Prepare Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'"
+          commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
           labels: "internal"
+          sign-commits: true
           branch: release-preview
-          title: Prepare Alpha Release ${{ steps.explanation.outputs.new_version }}
+          title: Prepare Alpha Release ${{ steps.explanation.outputs.new-version }}
           body: |
             This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
 

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

@@ -8,85 +8,50 @@ on:
     types:
       - labeled
       - unlabeled
-    branches:
-      - beta
 
 concurrency:
   group: plan-release-beta # only the latest one of these should ever be running
   cancel-in-progress: true
 
 jobs:
-  is-this-a-release:
-    name: "Is this a release?"
+  should-run-release-plan-prepare:
+    name: Should we run release-plan prepare?
     runs-on: ubuntu-latest
     outputs:
-      command: ${{ steps.check-release.outputs.command }}
-
+      should-prepare: ${{ steps.should-prepare.outputs.should-prepare }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: release-plan/actions/should-prepare-release@v1
         with:
-          fetch-depth: 2
           ref: 'beta'
-      # This will only cause the `is-this-a-release` job to have a "command" of `release`
-      # when the .release-plan.json file was changed on the last commit.
-      - id: check-release
-        run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
+        id: should-prepare
 
   create-prepare-release-pr:
     name: Create Prepare Release PR
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: is-this-a-release
+    needs: should-run-release-plan-prepare
     permissions:
       contents: write
       issues: read
       pull-requests: write
-    # only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing)
-    # only run on labeled event if the PR has already been merged
-    if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)
-
+    if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true'
     steps:
-      - uses: actions/checkout@v4
-        # We need to download lots of history so that
-        # github-changelog can discover what's changed since the last release
+      - uses: release-plan/actions/prepare@v1
+        name: Run release-plan prepare
         with:
-          fetch-depth: 0
           ref: 'beta'
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: "Generate Explanation and Prep Changelogs"
-        id: explanation
-        run: |
-          set +e
-          pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
-
-          if [ $? -ne 0 ]; then
-            release_plan_output=$(cat release-plan-stderr.txt)
-          else
-            release_plan_output=$(jq .description .release-plan.json -r)
-            rm release-plan-stderr.txt
-
-            if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then
-              new_version=$(jq -r '.solution[].newVersion' .release-plan.json)
-              echo "new_version=v$new_version" >> $GITHUB_OUTPUT
-            fi
-          fi
-            echo 'text<<EOF' >> $GITHUB_OUTPUT
-          echo "$release_plan_output" >> $GITHUB_OUTPUT
-            echo 'EOF' >> $GITHUB_OUTPUT
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
+        id: explanation
 
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v8
+        name: Create Prepare Release PR
         with:
-          commit-message: "Prepare Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'"
+          commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
           labels: "internal"
-          branch: release-preview
-          title: Prepare Beta Release ${{ steps.explanation.outputs.new_version }}
+          sign-commits: true
+          branch: release-preview-beta
+          title: Prepare Beta Release ${{ steps.explanation.outputs.new-version }}
           body: |
             This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
 

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

@@ -8,85 +8,50 @@ on:
     types:
       - labeled
       - unlabeled
-    branches:
-      - release
 
 concurrency:
   group: plan-release # only the latest one of these should ever be running
   cancel-in-progress: true
 
 jobs:
-  is-this-a-release:
-    name: "Is this a release?"
+  should-run-release-plan-prepare:
+    name: Should we run release-plan prepare?
     runs-on: ubuntu-latest
     outputs:
-      command: ${{ steps.check-release.outputs.command }}
-
+      should-prepare: ${{ steps.should-prepare.outputs.should-prepare }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: release-plan/actions/should-prepare-release@v1
         with:
-          fetch-depth: 2
           ref: 'release'
-      # This will only cause the `is-this-a-release` job to have a "command" of `release`
-      # when the .release-plan.json file was changed on the last commit.
-      - id: check-release
-        run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
+        id: should-prepare
 
   create-prepare-release-pr:
     name: Create Prepare Release PR
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: is-this-a-release
+    needs: should-run-release-plan-prepare
     permissions:
       contents: write
       issues: read
       pull-requests: write
-    # only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing)
-    # only run on labeled event if the PR has already been merged
-    if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)
-
+    if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true'
     steps:
-      - uses: actions/checkout@v4
-        # We need to download lots of history so that
-        # github-changelog can discover what's changed since the last release
+      - uses: release-plan/actions/prepare@v1
+        name: Run release-plan prepare
         with:
-          fetch-depth: 0
           ref: 'release'
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: "Generate Explanation and Prep Changelogs"
-        id: explanation
-        run: |
-          set +e
-          pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
-
-          if [ $? -ne 0 ]; then
-            release_plan_output=$(cat release-plan-stderr.txt)
-          else
-            release_plan_output=$(jq .description .release-plan.json -r)
-            rm release-plan-stderr.txt
-
-            if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then
-              new_version=$(jq -r '.solution[].newVersion' .release-plan.json)
-              echo "new_version=v$new_version" >> $GITHUB_OUTPUT
-            fi
-          fi
-            echo 'text<<EOF' >> $GITHUB_OUTPUT
-          echo "$release_plan_output" >> $GITHUB_OUTPUT
-            echo 'EOF' >> $GITHUB_OUTPUT
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
+        id: explanation
 
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v8
+        name: Create Prepare Release PR
         with:
-          commit-message: "Prepare Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'"
+          commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
           labels: "internal"
-          branch: release-preview
-          title: Prepare Stable Release ${{ steps.explanation.outputs.new_version }}
+          sign-commits: true
+          branch: release-preview-stable
+          title: Prepare Stable Release ${{ steps.explanation.outputs.new-version }}
           body: |
             This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
 

package/.github/workflows/publish.yml

@@ -0,0 +1,52 @@
+# Every push to any of the primary branches (master, beta, release) with .release-plan.json modified,
+# runs release-plan publish.
+
+name: Publish
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - master
+      - release
+      - beta
+    paths:
+      - '.release-plan.json'
+
+concurrency:
+  group: publish-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  publish:
+    name: "NPM Publish"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+      attestations: write
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 22
+          registry-url: 'https://registry.npmjs.org'
+          cache: pnpm
+      - run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC
+      - run: pnpm install --frozen-lockfile
+      - name: Publish to NPM
+        # 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
+            pnpm release-plan publish --github-prerelease --publish-branch=beta
+          else
+            pnpm release-plan publish --github-prerelease
+          fi
+        env:
+          GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}

package/.release-plan.json

@@ -2,17 +2,21 @@
   "solution": {
     "@ember/app-blueprint": {
       "impact": "patch",
-      "oldVersion": "6.10.2",
-      "newVersion": "6.10.3",
+      "oldVersion": "6.10.3",
+      "newVersion": "6.10.4",
       "tagName": "latest",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2026-01-23)\n\n* @ember/app-blueprint 6.10.3 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))\n\n#### Committers: 1\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n"
+  "description": "## Release (2026-02-09)\n\n* @ember/app-blueprint 6.10.4 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#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))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n  * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 2\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## Release (2026-02-09)
+
+* @ember/app-blueprint 6.10.4 (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))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
+
+#### 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)

package/conditional-files/_js_eslint.config.mjs

@@ -17,8 +17,8 @@ import js from '@eslint/js';
 import { defineConfig, globalIgnores } from 'eslint/config';
 
 import ember from 'eslint-plugin-ember/recommended';
-<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %>
-import eslintConfigPrettier from 'eslint-config-prettier';
+<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended';
+<% } %>import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
 import n from 'eslint-plugin-n';
 
@@ -35,8 +35,8 @@ export default defineConfig([
   eslintConfigPrettier,
   ember.configs.base,
   ember.configs.gjs,
-  <% if (warpDrive) { %>...WarpDrive,<% } %>
-  /**
+  <% if (warpDrive) { %>...WarpDrive,
+  <% } %>/**
    * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
    */
   {

package/conditional-files/_ts_eslint.config.mjs

@@ -19,8 +19,8 @@ import { defineConfig, globalIgnores } from 'eslint/config';
 import ts from 'typescript-eslint';
 
 import ember from 'eslint-plugin-ember/recommended';
-<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %>
-
+<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended';
+<% } %>
 import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
 import n from 'eslint-plugin-n';
@@ -46,8 +46,8 @@ export default defineConfig([
   ember.configs.base,
   ember.configs.gjs,
   ember.configs.gts,
-  <% if (warpDrive) { %>...WarpDrive,<% } %>
-  eslintConfigPrettier,
+  <% if (warpDrive) { %>...WarpDrive,
+  <% } %>eslintConfigPrettier,
   /**
    * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
    */

package/files/app/app.ts

@@ -1,5 +1,5 @@
-<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
-import Application from '@ember/application';
+<% if (warpDrive) { %>import '@warp-drive/ember/install';
+<% } %>import Application from '@ember/application';
 import compatModules from '@embroider/virtual/compat-modules';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';

package/files/tests/test-helper.ts

@@ -1,5 +1,5 @@
-<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
-import Application from '<%= modulePrefix %>/app';
+<% if (warpDrive) { %>import '@warp-drive/ember/install';
+<% } %>import Application from '<%= modulePrefix %>/app';
 import config from '<%= modulePrefix %>/config/environment';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "6.10.3",
+  "version": "6.10.4",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"

package/.github/workflows/publish-alpha.yml

@@ -1,42 +0,0 @@
-# For every push to the primary branch with .release-plan.json modified,
-# runs release-plan.
-
-name: Publish Alpha
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - '.release-plan.json'
-
-concurrency:
-  group: publish-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  publish:
-    name: "NPM Publish"
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      id-token: write
-      attestations: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
-          registry-url: 'https://registry.npmjs.org'
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: Publish to NPM
-        run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --github-prerelease
-        env:
-          GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/publish-beta.yml

@@ -1,42 +0,0 @@
-# For every push to the primary branch with .release-plan.json modified,
-# runs release-plan.
-
-name: Publish Beta
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - beta
-    paths:
-      - '.release-plan.json'
-
-concurrency:
-  group: publish-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  publish:
-    name: "NPM Publish"
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      id-token: write
-      attestations: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
-          registry-url: 'https://registry.npmjs.org'
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: Publish to NPM
-        run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --publish-branch=beta --github-prerelease
-        env:
-          GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/publish-stable.yml

@@ -1,42 +0,0 @@
-# For every push to the primary branch with .release-plan.json modified,
-# runs release-plan.
-
-name: Publish Stable
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - release
-    paths:
-      - '.release-plan.json'
-
-concurrency:
-  group: publish-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  publish:
-    name: "NPM Publish"
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      id-token: write
-      attestations: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
-          registry-url: 'https://registry.npmjs.org'
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: Publish to NPM
-        run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --publish-branch=release
-        env:
-          GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}