From 390a4268bff2d3c32dd29357db0de74e23b2adcb Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 2 Apr 2026 22:32:31 +0100 Subject: [PATCH 01/12] update blueprint dependencies to latest --- files/package.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/files/package.json b/files/package.json index d6818ef..5469981 100644 --- a/files/package.json +++ b/files/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@babel/core": "^7.29.0", - "@babel/runtime": "^7.28.6", + "@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) { %>", @@ -41,18 +41,18 @@ "@ember/string": "^4.0.1", "@ember/test-helpers": "^5.4.1", "@ember/test-waiters": "^4.1.1", - "@embroider/macros": "^1.19.7", - "@embroider/core": "^4.4.3", - "@embroider/vite": "^1.5.2", - "@embroider/compat": "^4.1.13", + "@embroider/macros": "^1.20.2", + "@embroider/core": "^4.4.7", + "@embroider/vite": "^1.7.2", + "@embroider/compat": "^4.1.17", "@embroider/router": "^3.0.6", "@embroider/config-meta-loader": "^1.0.0", "@embroider/legacy-inspector-support": "^0.1.3", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0<% if (typescript) { %>", - "@glint/ember-tsc": "^1.1.1", - "@glint/template": "^1.7.4", - "@glint/tsserver-plugin": "^2.1.0<% } %>", + "@glint/ember-tsc": "^1.5.0", + "@glint/template": "^1.7.7", + "@glint/tsserver-plugin": "^2.4.0<% } %>", "@rollup/plugin-babel": "^6.1.0<% if (typescript) { %>", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", @@ -64,18 +64,18 @@ "babel-plugin-ember-template-compilation": "^3.1.0", "concurrently": "^9.2.1", "decorator-transforms": "^2.3.1", - "ember-cli": "~6.11.0", + "ember-cli": "~6.11.2", "ember-cli-babel": "^8.3.1", "ember-cli-deprecation-workflow": "^3.4.0", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.12.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-lint": "^7.9.3<% if (welcome) { %>", "ember-welcome-page": "^8.0.5<% } %>", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -88,9 +88,9 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^38.0.0", - "testem": "^3.17.0<% if (typescript) { %>", + "testem": "^3.19.1<% if (typescript) { %>", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0<% } %>", + "typescript-eslint": "^8.58.0<% } %>", "vite": "^7.3.1" }, "engines": { From 45d26031deece9bc200616287ea4241ce683bae9 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 3 Apr 2026 16:23:42 +0100 Subject: [PATCH 02/12] split tests into individual matrix jobs --- .github/workflows/ci.yml | 35 ++++++++++++++++++++++++----------- package.json | 3 ++- pnpm-lock.yaml | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c7d59d..acbedb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,19 +23,32 @@ jobs: - run: pnpm install --frozen-lockfile - run: pnpm lint - test: - name: Test + matrix-job: + name: "Setup Matrix" + runs-on: ubuntu-latest + timeout-minutes: 1 + outputs: + matrix: ${{ steps.set-matrix.outputs.matrix }} + + steps: + - uses: actions/checkout@v6 + - uses: pnpm/action-setup@v4 + - uses: actions/setup-node@v6 + with: + node-version: 24 + cache: 'pnpm' + - run: pnpm install + - id: set-matrix + run: echo "matrix=$(pnpm vitest-matrix --node 20 22 24 --os ubuntu-latest windows-latest)" >> $GITHUB_OUTPUT + + tests: + name: ${{ matrix.name }} - Node ${{matrix.node}} - ${{matrix.os}} runs-on: ${{ matrix.os }} + needs: "matrix-job" strategy: fail-fast: false matrix: - os: - - ubuntu-latest - - windows-latest - node: - - 20 - - 22 - - 24 + include: ${{fromJson(needs.matrix-job.outputs.matrix)}} steps: - uses: actions/checkout@v4 @@ -45,9 +58,9 @@ jobs: node-version: ${{ matrix.node }} cache: pnpm - name: Set TEMP to D:/Temp on windows - if: ${{matrix.os}} == windows-latest + if: ${{matrix.os == 'windows-latest'}} run: | mkdir "D:\\Temp" echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV - run: pnpm install --frozen-lockfile - - run: pnpm test + - run: pnpm ${{matrix.command}} diff --git a/package.json b/package.json index d67f8a1..4724bb1 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "release-plan": "^0.17.2", "strip-ansi": "^7.1.0", "tmp-promise": "^3.0.3", - "vitest": "^4.0.0-beta.17" + "vitest": "^4.0.0-beta.17", + "vitest-matrix": "^0.2.0" }, "packageManager": "pnpm@10.20.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2707ad..f672a3a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,6 +72,9 @@ importers: vitest: specifier: ^4.0.0-beta.17 version: 4.0.0-beta.17(@types/node@22.15.2) + vitest-matrix: + specifier: ^0.2.0 + version: 0.2.0 packages: @@ -1281,6 +1284,10 @@ packages: resolution: {integrity: sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==} engines: {node: '>=0.1.90'} + commander@15.0.0-0: + resolution: {integrity: sha512-R2Kbbun8cjOe1aTbX4elymOwNvIdWenwSZl++AeuCu8nBGvJO5qCEwZ8Wa/8GMg5TXj/dBcPiQm/l1T9DO+Ryg==} + engines: {node: '>=22.12.0'} + commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -1871,6 +1878,10 @@ packages: resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==} engines: {node: ^18.19.0 || >=20.5.0} + execa@9.6.1: + resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==} + engines: {node: ^18.19.0 || >=20.5.0} + exit@0.1.2: resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==} engines: {node: '>= 0.8.0'} @@ -4094,6 +4105,10 @@ packages: yaml: optional: true + vitest-matrix@0.2.0: + resolution: {integrity: sha512-InT339N1+/nJj3XTaPuG+eiISiqAq5mlt7uO0D77skI2xlfXleIsDtLKziaIbdmMlYosx9oCE5mVvSNiqCcZYg==} + hasBin: true + vitest@4.0.0-beta.17: resolution: {integrity: sha512-R2vM2ErERS4hcmrZ0vrGhy/v9HEkCRnUXHJLhuvnQfO8uWspjuMNxIej1Ru/pBvR5pDfN2mqb1679Lk4yyJ7NA==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -5636,6 +5651,8 @@ snapshots: colors@1.0.3: {} + commander@15.0.0-0: {} + commander@2.20.3: {} commander@4.1.1: {} @@ -6239,6 +6256,21 @@ snapshots: strip-final-newline: 4.0.0 yoctocolors: 2.1.1 + execa@9.6.1: + dependencies: + '@sindresorhus/merge-streams': 4.0.0 + cross-spawn: 7.0.6 + figures: 6.1.0 + get-stream: 9.0.1 + human-signals: 8.0.1 + is-plain-obj: 4.1.0 + is-stream: 4.0.1 + npm-run-path: 6.0.0 + pretty-ms: 9.2.0 + signal-exit: 4.1.0 + strip-final-newline: 4.0.0 + yoctocolors: 2.1.1 + exit@0.1.2: {} expand-brackets@2.1.4: @@ -8720,6 +8752,11 @@ snapshots: '@types/node': 22.15.2 fsevents: 2.3.3 + vitest-matrix@0.2.0: + dependencies: + commander: 15.0.0-0 + execa: 9.6.1 + vitest@4.0.0-beta.17(@types/node@22.15.2): dependencies: '@vitest/expect': 4.0.0-beta.17 From c5f929749ec995c7358f673d1840dc101d76732b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Apr 2026 19:19:44 +0000 Subject: [PATCH 03/12] Prepare Release v6.12.0 using 'release-plan' --- .release-plan.json | 20 ++++++++++++++++---- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ package.json | 2 +- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 667b88e..a6b70f6 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,18 +1,30 @@ { "solution": { "@ember/app-blueprint": { - "impact": "patch", - "oldVersion": "6.11.1", - "newVersion": "6.11.2", + "impact": "minor", + "oldVersion": "6.11.2", + "newVersion": "6.12.0", "tagName": "latest", "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-03-03)\n\n* @ember/app-blueprint 6.11.2 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-04-03)\n\n* @ember/app-blueprint 6.12.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona))\n * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))\n * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))\n * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))\n * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))\n * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))\n\n#### Committers: 4\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index cf83d8f..a214b65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,36 @@ # Changelog +## Release (2026-04-03) + +* @ember/app-blueprint 6.12.0 (minor) + +#### :rocket: Enhancement +* `@ember/app-blueprint` + * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona)) + * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv)) + +#### :bug: Bug Fix +* `@ember/app-blueprint` + * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex)) + * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv)) + * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp)) + +#### :memo: Documentation +* `@ember/app-blueprint` + * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona)) + +#### :house: Internal +* `@ember/app-blueprint` + * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona)) + * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona)) + * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona)) + +#### Committers: 4 +- Alex ([@void-mAlex](https://github.com/void-mAlex)) +- Alexey Kulakov ([@aklkv](https://github.com/aklkv)) +- Chris Manson ([@mansona](https://github.com/mansona)) +- Markus Sanin ([@mkszepp](https://github.com/mkszepp)) + ## Release (2026-03-03) * @ember/app-blueprint 6.11.2 (patch) diff --git a/package.json b/package.json index 4724bb1..8061b4c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ember/app-blueprint", - "version": "6.11.2", + "version": "6.12.0", "description": "Blueprint for next generation of Ember apps", "keywords": [ "ember-blueprint" From 66a97e90f9056d06fc14bbe3ec2935eadbcc4a62 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 9 Apr 2026 14:51:30 +0100 Subject: [PATCH 04/12] Revert "Prepare Release v6.12.0 using 'release-plan'" This reverts commit c5f929749ec995c7358f673d1840dc101d76732b. --- CHANGELOG.md | 31 ------------------------------- package.json | 2 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a214b65..cf83d8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,5 @@ # Changelog -## Release (2026-04-03) - -* @ember/app-blueprint 6.12.0 (minor) - -#### :rocket: Enhancement -* `@ember/app-blueprint` - * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona)) - * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv)) - -#### :bug: Bug Fix -* `@ember/app-blueprint` - * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex)) - * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv)) - * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp)) - -#### :memo: Documentation -* `@ember/app-blueprint` - * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona)) - -#### :house: Internal -* `@ember/app-blueprint` - * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona)) - * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona)) - * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona)) - -#### Committers: 4 -- Alex ([@void-mAlex](https://github.com/void-mAlex)) -- Alexey Kulakov ([@aklkv](https://github.com/aklkv)) -- Chris Manson ([@mansona](https://github.com/mansona)) -- Markus Sanin ([@mkszepp](https://github.com/mkszepp)) - ## Release (2026-03-03) * @ember/app-blueprint 6.11.2 (patch) diff --git a/package.json b/package.json index 8061b4c..4724bb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ember/app-blueprint", - "version": "6.12.0", + "version": "6.11.2", "description": "Blueprint for next generation of Ember apps", "keywords": [ "ember-blueprint" From 4352f359fc149394cd6e76ad6760a4b643375090 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 9 Apr 2026 14:54:32 +0100 Subject: [PATCH 05/12] update node to a version that doesn't need to update npm --- .github/workflows/publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 941cb27..33657c3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -33,10 +33,9 @@ jobs: - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v6 with: - node-version: 22 + node-version: 24 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 From 607f28e5698b217a27ec598ceefb73bdd6e62f43 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:00:25 +0000 Subject: [PATCH 06/12] Prepare Release v6.12.0 using 'release-plan' --- .release-plan.json | 2 +- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ package.json | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index a6b70f6..958cd39 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -26,5 +26,5 @@ "pkgJSONPath": "./package.json" } }, - "description": "## Release (2026-04-03)\n\n* @ember/app-blueprint 6.12.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona))\n * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))\n * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))\n * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))\n * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))\n * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))\n\n#### Committers: 4\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n" + "description": "## Release (2026-04-09)\n\n* @ember/app-blueprint 6.12.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona))\n * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))\n * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))\n * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#247](https://github.com/ember-cli/ember-app-blueprint/pull/247) update node for Publish CI to a version that doesn't need to update npm ([@mansona](https://github.com/mansona))\n * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))\n * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))\n * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))\n\n#### Committers: 4\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index cf83d8f..f2ec6f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## Release (2026-04-09) + +* @ember/app-blueprint 6.12.0 (minor) + +#### :rocket: Enhancement +* `@ember/app-blueprint` + * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona)) + * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv)) + +#### :bug: Bug Fix +* `@ember/app-blueprint` + * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex)) + * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv)) + * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp)) + +#### :memo: Documentation +* `@ember/app-blueprint` + * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona)) + +#### :house: Internal +* `@ember/app-blueprint` + * [#247](https://github.com/ember-cli/ember-app-blueprint/pull/247) update node for Publish CI to a version that doesn't need to update npm ([@mansona](https://github.com/mansona)) + * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona)) + * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona)) + * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona)) + +#### Committers: 4 +- Alex ([@void-mAlex](https://github.com/void-mAlex)) +- Alexey Kulakov ([@aklkv](https://github.com/aklkv)) +- Chris Manson ([@mansona](https://github.com/mansona)) +- Markus Sanin ([@mkszepp](https://github.com/mkszepp)) + ## Release (2026-03-03) * @ember/app-blueprint 6.11.2 (patch) diff --git a/package.json b/package.json index 4724bb1..8061b4c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ember/app-blueprint", - "version": "6.11.2", + "version": "6.12.0", "description": "Blueprint for next generation of Ember apps", "keywords": [ "ember-blueprint" From 01b2dc81e64f672867c02c4f3297597c17466054 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 18 Apr 2026 10:53:53 +0100 Subject: [PATCH 07/12] update ember-cli dependency to latest --- files/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/package.json b/files/package.json index 5469981..1b4115d 100644 --- a/files/package.json +++ b/files/package.json @@ -64,7 +64,7 @@ "babel-plugin-ember-template-compilation": "^3.1.0", "concurrently": "^9.2.1", "decorator-transforms": "^2.3.1", - "ember-cli": "~6.11.2", + "ember-cli": "~6.12.0", "ember-cli-babel": "^8.3.1", "ember-cli-deprecation-workflow": "^3.4.0", "ember-load-initializers": "^3.0.1", From e66a3e7fe189e6f258935c6bcc48ee64aa3690cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2026 10:00:00 +0000 Subject: [PATCH 08/12] Prepare Release v6.12.1 using 'release-plan' --- .release-plan.json | 20 ++++---------------- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 958cd39..21aa98c 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,30 +1,18 @@ { "solution": { "@ember/app-blueprint": { - "impact": "minor", - "oldVersion": "6.11.2", - "newVersion": "6.12.0", + "impact": "patch", + "oldVersion": "6.12.0", + "newVersion": "6.12.1", "tagName": "latest", "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-04-09)\n\n* @ember/app-blueprint 6.12.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#243](https://github.com/ember-cli/ember-app-blueprint/pull/243) Promote Beta and update all dependencies for 6.12 release ([@mansona](https://github.com/mansona))\n * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))\n * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))\n * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#247](https://github.com/ember-cli/ember-app-blueprint/pull/247) update node for Publish CI to a version that doesn't need to update npm ([@mansona](https://github.com/mansona))\n * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))\n * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))\n * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))\n\n#### Committers: 4\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n" + "description": "## Release (2026-04-18)\n\n* @ember/app-blueprint 6.12.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#251](https://github.com/ember-cli/ember-app-blueprint/pull/251) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ec6f7..155ac9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## Release (2026-04-18) + +* @ember/app-blueprint 6.12.1 (patch) + +#### :bug: Bug Fix +* `@ember/app-blueprint` + * [#251](https://github.com/ember-cli/ember-app-blueprint/pull/251) update ember-cli dependency to latest ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-04-09) * @ember/app-blueprint 6.12.0 (minor) diff --git a/package.json b/package.json index 8061b4c..c7a9921 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ember/app-blueprint", - "version": "6.12.0", + "version": "6.12.1", "description": "Blueprint for next generation of Ember apps", "keywords": [ "ember-blueprint" From 9d59613e111c58ce8eb4270878fe4251a4f30414 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 18 Apr 2026 11:09:59 +0100 Subject: [PATCH 09/12] update blueprint dependencies to beta --- files/package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/files/package.json b/files/package.json index 9297c79..38e371f 100644 --- a/files/package.json +++ b/files/package.json @@ -49,18 +49,18 @@ "@embroider/config-meta-loader": "^1.0.0", "@embroider/legacy-inspector-support": "^0.1.3", "@eslint/js": "^9.39.4", - "@glimmer/component": "^2.0.0<% if (typescript) { %>", + "@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": "^6.1.0<% if (typescript) { %>", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", - "@warp-drive/core": "~5.8.1", - "@warp-drive/ember": "~5.8.1", - "@warp-drive/json-api": "~5.8.1", - "@warp-drive/legacy": "~5.8.1", - "@warp-drive/utilities": "~5.8.1<% } %>", + "@warp-drive/core": "~5.8.2", + "@warp-drive/ember": "~5.8.2", + "@warp-drive/json-api": "~5.8.2", + "@warp-drive/legacy": "~5.8.2", + "@warp-drive/utilities": "~5.8.2<% } %>", "babel-plugin-ember-template-compilation": "^3.1.0", "concurrently": "^9.2.1", "decorator-transforms": "^2.3.1", @@ -80,18 +80,18 @@ "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>", - "eslint-plugin-warp-drive": "^5.8.1<% } %>", + "eslint-plugin-warp-drive": "^5.8.2<% } %>", "globals": "^16.5.0", - "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.3", + "prettier": "^3.8.3", + "prettier-plugin-ember-template-tag": "^2.1.5", "qunit": "^2.25.0", - "qunit-dom": "^3.5.0", + "qunit-dom": "^3.5.1", "stylelint": "^16.26.1", "stylelint-config-standard": "^38.0.0", - "testem": "^3.19.1<% if (typescript) { %>", + "testem": "^3.20.0<% if (typescript) { %>", "typescript": "^5.9.3", - "typescript-eslint": "^8.58.0<% } %>", - "vite": "^7.3.1" + "typescript-eslint": "^8.58.2<% } %>", + "vite": "^7.3.2" }, "engines": { "node": ">= 20.19.0" From 7b5d0108f58507d5b6b4c5d6e891f9b8dbd8a426 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2026 10:22:56 +0000 Subject: [PATCH 10/12] Prepare Release v7.0.0-beta.1 using 'release-plan' --- .release-plan.json | 14 +++----------- CHANGELOG.md | 17 +++++++++++++++++ package.json | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index dad9d89..e9ed306 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,22 +2,14 @@ "solution": { "@ember/app-blueprint": { "impact": "minor", - "oldVersion": "6.12.0-beta.0", - "newVersion": "6.12.0-beta.1", + "oldVersion": "7.0.0-beta.0", + "newVersion": "7.0.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" @@ -26,5 +18,5 @@ "pkgJSONPath": "./package.json" } }, - "description": "## Release (2026-04-02)\n\n* @ember/app-blueprint 6.12.0-beta.1 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#238](https://github.com/ember-cli/ember-app-blueprint/pull/238) Promote 6.12 to beta and update dependencies ([@mansona](https://github.com/mansona))\n * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))\n * [#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))\n * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))\n * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))\n * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))\n * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))\n\n#### Committers: 4\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n" + "description": "## Release (2026-04-18)\n\n* @ember/app-blueprint 7.0.0-beta.1 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#254](https://github.com/ember-cli/ember-app-blueprint/pull/254) Prepare 7.0 Beta ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#249](https://github.com/ember-cli/ember-app-blueprint/pull/249) fix publish ([@mansona](https://github.com/mansona))\n * [#247](https://github.com/ember-cli/ember-app-blueprint/pull/247) update node for Publish CI to a version that doesn't need to update npm ([@mansona](https://github.com/mansona))\n * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 155ac9a..df432ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ ## Release (2026-04-18) +* @ember/app-blueprint 7.0.0-beta.1 (minor) + +#### :rocket: Enhancement +* `@ember/app-blueprint` + * [#254](https://github.com/ember-cli/ember-app-blueprint/pull/254) Prepare 7.0 Beta ([@mansona](https://github.com/mansona)) + +#### :house: Internal +* `@ember/app-blueprint` + * [#249](https://github.com/ember-cli/ember-app-blueprint/pull/249) fix publish ([@mansona](https://github.com/mansona)) + * [#247](https://github.com/ember-cli/ember-app-blueprint/pull/247) update node for Publish CI to a version that doesn't need to update npm ([@mansona](https://github.com/mansona)) + * [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + +## Release (2026-04-18) + * @ember/app-blueprint 6.12.1 (patch) #### :bug: Bug Fix diff --git a/package.json b/package.json index 7c0f8e7..7f4488f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ember/app-blueprint", - "version": "7.0.0-beta.0", + "version": "7.0.0-beta.1", "description": "Blueprint for next generation of Ember apps", "keywords": [ "ember-blueprint" From 5a792aa7897b360b31d9f1278874ef5b7e6e8ef4 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 18 Apr 2026 11:26:43 +0100 Subject: [PATCH 11/12] update to the next alpha version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a3091f..fd107b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ember/app-blueprint", - "version": "7.0.0-alpha.2", + "version": "7.1.0-alpha.0", "description": "Blueprint for next generation of Ember apps", "keywords": [ "ember-blueprint" From 6979c951f2bd2d6ecaee92fff1ac67eedfb20d08 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 18 Apr 2026 11:59:57 +0100 Subject: [PATCH 12/12] update blueprint dependencies to alpha --- files/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/package.json b/files/package.json index 38e371f..51d54d2 100644 --- a/files/package.json +++ b/files/package.json @@ -72,7 +72,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.2.0", - "ember-source": "~7.0.0-beta.1", + "ember-source": "~7.1.0-alpha.2", "ember-template-lint": "^7.9.3<% if (welcome) { %>", "ember-welcome-page": "^8.0.5<% } %>", "eslint": "^9.39.4",