Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3ce25ed
Merge branch 'origin/beta' into release-plan-6-12
mansona Apr 2, 2026
390a426
update blueprint dependencies to latest
mansona Apr 2, 2026
45d2603
split tests into individual matrix jobs
mansona Apr 3, 2026
f1dc6d0
Merge pull request #244 from ember-cli/github-matrix
mansona Apr 3, 2026
ea3540b
Merge remote-tracking branch 'origin/release' into release-plan-6-12
mansona Apr 3, 2026
a5acb46
Merge pull request #243 from ember-cli/release-plan-6-12
mansona Apr 3, 2026
c5f9297
Prepare Release v6.12.0 using 'release-plan'
github-actions[bot] Apr 3, 2026
1e44651
Merge pull request #245 from ember-cli/release-preview-stable
mansona Apr 3, 2026
66a97e9
Revert "Prepare Release v6.12.0 using 'release-plan'"
mansona Apr 9, 2026
4352f35
update node to a version that doesn't need to update npm
mansona Apr 9, 2026
4f870fe
Merge pull request #246 from ember-cli/reset-version-release
mansona Apr 9, 2026
c131306
Merge pull request #247 from ember-cli/fix-release-plan
mansona Apr 9, 2026
607f28e
Prepare Release v6.12.0 using 'release-plan'
github-actions[bot] Apr 9, 2026
20798de
Merge pull request #248 from ember-cli/release-preview-stable
mansona Apr 9, 2026
01b2dc8
update ember-cli dependency to latest
mansona Apr 18, 2026
777fb7b
Merge pull request #251 from ember-cli/update-ember-cli
mansona Apr 18, 2026
e66a3e7
Prepare Release v6.12.1 using 'release-plan'
github-actions[bot] Apr 18, 2026
0ec90cf
Merge pull request #252 from ember-cli/release-preview-stable
mansona Apr 18, 2026
1ff4c3a
Merge branch 'origin/release' into beta
mansona Apr 18, 2026
79a8d14
Merge branch 'origin/main' into beta
mansona Apr 18, 2026
9d59613
update blueprint dependencies to beta
mansona Apr 18, 2026
639e176
Merge pull request #254 from ember-cli/merge-release
mansona Apr 18, 2026
7b5d010
Prepare Release v7.0.0-beta.1 using 'release-plan'
github-actions[bot] Apr 18, 2026
94d8c62
Merge pull request #255 from ember-cli/release-preview-beta
mansona Apr 18, 2026
3dd2a68
Merge branch 'origin/beta' into main
mansona Apr 18, 2026
5a792aa
update to the next alpha version
mansona Apr 18, 2026
6979c95
update blueprint dependencies to alpha
mansona Apr 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,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
Expand All @@ -47,9 +60,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}}
43 changes: 14 additions & 29 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,61 +1,44 @@
# Changelog

## Release (2026-04-17)
## Release (2026-04-18)

* @ember/app-blueprint 7.0.0-alpha.2 (minor)
* @ember/app-blueprint 7.0.0-beta.1 (minor)

#### :rocket: Enhancement
* `@ember/app-blueprint`
* [#242](https://github.com/ember-cli/ember-app-blueprint/pull/242) Prepare 7.0-alpha ([@mansona](https://github.com/mansona))

#### :bug: Bug Fix
* `@ember/app-blueprint`
* [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@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))
* [#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))
* [#234](https://github.com/ember-cli/ember-app-blueprint/pull/234) Prepare Alpha Release v7.0.0-alpha.1 ([@github-actions[bot]](https://github.com/apps/github-actions))
* [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch 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: 2
#### Committers: 1
- Chris Manson ([@mansona](https://github.com/mansona))
- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))

## Release (2026-04-17)
## Release (2026-04-18)

* @ember/app-blueprint 7.0.0-alpha.1 (minor)

#### :rocket: Enhancement
* `@ember/app-blueprint`
* [#242](https://github.com/ember-cli/ember-app-blueprint/pull/242) Prepare 7.0-alpha ([@mansona](https://github.com/mansona))
* @ember/app-blueprint 6.12.1 (patch)

#### :bug: Bug Fix
* `@ember/app-blueprint`
* [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@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))

#### :house: Internal
* `@ember/app-blueprint`
* [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))
* [#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-02)
## Release (2026-04-09)

* @ember/app-blueprint 6.12.0-beta.1 (minor)
* @ember/app-blueprint 6.12.0 (minor)

#### :rocket: Enhancement
* `@ember/app-blueprint`
* [#238](https://github.com/ember-cli/ember-app-blueprint/pull/238) Promote 6.12 to beta and update dependencies ([@mansona](https://github.com/mansona))
* [#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`
* [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@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))
* [#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))
Expand All @@ -66,6 +49,8 @@

#### :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))

Expand Down
52 changes: 26 additions & 26 deletions files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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) { %>",
Expand All @@ -41,57 +41,57 @@
"@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",
"@glimmer/component": "^2.0.0<% if (typescript) { %>",
"@glint/ember-tsc": "^1.1.1",
"@glint/template": "^1.7.4",
"@glint/tsserver-plugin": "^2.1.0<% } %>",
"@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": "^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",
"ember-cli": "~6.11.0",
"ember-cli": "~6.12.0",
"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": "~7.0.0-beta.1",
"ember-resolver": "^13.2.0",
"ember-source": "~7.1.0-alpha.2",
"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",
"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.17.0<% if (typescript) { %>",
"testem": "^3.20.0<% if (typescript) { %>",
"typescript": "^5.9.3",
"typescript-eslint": "^8.56.0<% } %>",
"vite": "^7.3.1"
"typescript-eslint": "^8.58.2<% } %>",
"vite": "^7.3.2"
},
"engines": {
"node": ">= 20.19.0"
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -52,7 +52,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"
}
37 changes: 37 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading