Skip to content

Commit 542d598

Browse files
mansonamansona
authored
Merge pull request #256 from ember-cli/merge-beta
Prepare 7.1 Alpha
2 parents dc4baa5 + 6979c95 commit 542d598

5 files changed

Lines changed: 104 additions & 68 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,32 @@ jobs:
2525
- run: pnpm install --frozen-lockfile
2626
- run: pnpm lint
2727

28-
test:
29-
name: Test
28+
matrix-job:
29+
name: "Setup Matrix"
30+
runs-on: ubuntu-latest
31+
timeout-minutes: 1
32+
outputs:
33+
matrix: ${{ steps.set-matrix.outputs.matrix }}
34+
35+
steps:
36+
- uses: actions/checkout@v6
37+
- uses: pnpm/action-setup@v4
38+
- uses: actions/setup-node@v6
39+
with:
40+
node-version: 24
41+
cache: 'pnpm'
42+
- run: pnpm install
43+
- id: set-matrix
44+
run: echo "matrix=$(pnpm vitest-matrix --node 20 22 24 --os ubuntu-latest windows-latest)" >> $GITHUB_OUTPUT
45+
46+
tests:
47+
name: ${{ matrix.name }} - Node ${{matrix.node}} - ${{matrix.os}}
3048
runs-on: ${{ matrix.os }}
49+
needs: "matrix-job"
3150
strategy:
3251
fail-fast: false
3352
matrix:
34-
os:
35-
- ubuntu-latest
36-
- windows-latest
37-
node:
38-
- 20
39-
- 22
40-
- 24
53+
include: ${{fromJson(needs.matrix-job.outputs.matrix)}}
4154

4255
steps:
4356
- uses: actions/checkout@v4
@@ -47,9 +60,9 @@ jobs:
4760
node-version: ${{ matrix.node }}
4861
cache: pnpm
4962
- name: Set TEMP to D:/Temp on windows
50-
if: ${{matrix.os}} == windows-latest
63+
if: ${{matrix.os == 'windows-latest'}}
5164
run: |
5265
mkdir "D:\\Temp"
5366
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
5467
- run: pnpm install --frozen-lockfile
55-
- run: pnpm test
68+
- run: pnpm ${{matrix.command}}

‎CHANGELOG.md‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,44 @@
11
# Changelog
22

3-
## Release (2026-04-17)
3+
## Release (2026-04-18)
44

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

77
#### :rocket: Enhancement
88
* `@ember/app-blueprint`
9-
* [#242](https://github.com/ember-cli/ember-app-blueprint/pull/242) Prepare 7.0-alpha ([@mansona](https://github.com/mansona))
10-
11-
#### :bug: Bug Fix
12-
* `@ember/app-blueprint`
13-
* [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
14-
* [#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))
9+
* [#254](https://github.com/ember-cli/ember-app-blueprint/pull/254) Prepare 7.0 Beta ([@mansona](https://github.com/mansona))
1510

1611
#### :house: Internal
1712
* `@ember/app-blueprint`
1813
* [#249](https://github.com/ember-cli/ember-app-blueprint/pull/249) fix publish ([@mansona](https://github.com/mansona))
19-
* [#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))
20-
* [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))
14+
* [#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))
15+
* [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))
2116

22-
#### Committers: 2
17+
#### Committers: 1
2318
- Chris Manson ([@mansona](https://github.com/mansona))
24-
- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))
2519

26-
## Release (2026-04-17)
20+
## Release (2026-04-18)
2721

28-
* @ember/app-blueprint 7.0.0-alpha.1 (minor)
29-
30-
#### :rocket: Enhancement
31-
* `@ember/app-blueprint`
32-
* [#242](https://github.com/ember-cli/ember-app-blueprint/pull/242) Prepare 7.0-alpha ([@mansona](https://github.com/mansona))
22+
* @ember/app-blueprint 6.12.1 (patch)
3323

3424
#### :bug: Bug Fix
3525
* `@ember/app-blueprint`
36-
* [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
37-
* [#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))
38-
39-
#### :house: Internal
40-
* `@ember/app-blueprint`
41-
* [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))
26+
* [#251](https://github.com/ember-cli/ember-app-blueprint/pull/251) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
4227

4328
#### Committers: 1
4429
- Chris Manson ([@mansona](https://github.com/mansona))
4530

46-
## Release (2026-04-02)
31+
## Release (2026-04-09)
4732

48-
* @ember/app-blueprint 6.12.0-beta.1 (minor)
33+
* @ember/app-blueprint 6.12.0 (minor)
4934

5035
#### :rocket: Enhancement
5136
* `@ember/app-blueprint`
52-
* [#238](https://github.com/ember-cli/ember-app-blueprint/pull/238) Promote 6.12 to beta and update dependencies ([@mansona](https://github.com/mansona))
37+
* [#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))
5338
* [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))
5439

5540
#### :bug: Bug Fix
5641
* `@ember/app-blueprint`
57-
* [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
58-
* [#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))
5942
* [#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))
6043
* [#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))
6144
* [#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))
@@ -66,6 +49,8 @@
6649

6750
#### :house: Internal
6851
* `@ember/app-blueprint`
52+
* [#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))
53+
* [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))
6954
* [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))
7055
* [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))
7156

‎files/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"devDependencies": {
3434
"@babel/core": "^7.29.0",
35-
"@babel/runtime": "^7.28.6",
35+
"@babel/runtime": "^7.29.2",
3636
"@babel/plugin-transform-runtime": "^7.29.0<% if (typescript) { %>",
3737
"@babel/plugin-transform-typescript": "^7.28.6<% } %>",
3838
"@babel/eslint-parser": "^7.28.6<% if (typescript) { %>",
@@ -41,57 +41,57 @@
4141
"@ember/string": "^4.0.1",
4242
"@ember/test-helpers": "^5.4.1",
4343
"@ember/test-waiters": "^4.1.1",
44-
"@embroider/macros": "^1.19.7",
45-
"@embroider/core": "^4.4.3",
46-
"@embroider/vite": "^1.5.2",
47-
"@embroider/compat": "^4.1.13",
44+
"@embroider/macros": "^1.20.2",
45+
"@embroider/core": "^4.4.7",
46+
"@embroider/vite": "^1.7.2",
47+
"@embroider/compat": "^4.1.17",
4848
"@embroider/router": "^3.0.6",
4949
"@embroider/config-meta-loader": "^1.0.0",
5050
"@embroider/legacy-inspector-support": "^0.1.3",
51-
"@eslint/js": "^9.39.2",
52-
"@glimmer/component": "^2.0.0<% if (typescript) { %>",
53-
"@glint/ember-tsc": "^1.1.1",
54-
"@glint/template": "^1.7.4",
55-
"@glint/tsserver-plugin": "^2.1.0<% } %>",
51+
"@eslint/js": "^9.39.4",
52+
"@glimmer/component": "^2.1.1<% if (typescript) { %>",
53+
"@glint/ember-tsc": "^1.5.0",
54+
"@glint/template": "^1.7.7",
55+
"@glint/tsserver-plugin": "^2.4.0<% } %>",
5656
"@rollup/plugin-babel": "^6.1.0<% if (typescript) { %>",
5757
"@types/qunit": "^2.19.13",
5858
"@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
59-
"@warp-drive/core": "~5.8.1",
60-
"@warp-drive/ember": "~5.8.1",
61-
"@warp-drive/json-api": "~5.8.1",
62-
"@warp-drive/legacy": "~5.8.1",
63-
"@warp-drive/utilities": "~5.8.1<% } %>",
59+
"@warp-drive/core": "~5.8.2",
60+
"@warp-drive/ember": "~5.8.2",
61+
"@warp-drive/json-api": "~5.8.2",
62+
"@warp-drive/legacy": "~5.8.2",
63+
"@warp-drive/utilities": "~5.8.2<% } %>",
6464
"babel-plugin-ember-template-compilation": "^3.1.0",
6565
"concurrently": "^9.2.1",
6666
"decorator-transforms": "^2.3.1",
67-
"ember-cli": "~6.11.0",
67+
"ember-cli": "~6.12.0",
6868
"ember-cli-babel": "^8.3.1",
6969
"ember-cli-deprecation-workflow": "^3.4.0",
7070
"ember-load-initializers": "^3.0.1",
7171
"ember-modifier": "^4.3.0",
7272
"ember-page-title": "^9.0.3",
7373
"ember-qunit": "^9.0.4",
74-
"ember-resolver": "^13.1.1",
75-
"ember-source": "~7.0.0-beta.1",
74+
"ember-resolver": "^13.2.0",
75+
"ember-source": "~7.1.0-alpha.2",
7676
"ember-template-lint": "^7.9.3<% if (welcome) { %>",
7777
"ember-welcome-page": "^8.0.5<% } %>",
78-
"eslint": "^9.39.2",
78+
"eslint": "^9.39.4",
7979
"eslint-config-prettier": "^10.1.8",
8080
"eslint-plugin-ember": "^12.7.5",
8181
"eslint-plugin-n": "^17.24.0",
8282
"eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>",
83-
"eslint-plugin-warp-drive": "^5.8.1<% } %>",
83+
"eslint-plugin-warp-drive": "^5.8.2<% } %>",
8484
"globals": "^16.5.0",
85-
"prettier": "^3.8.1",
86-
"prettier-plugin-ember-template-tag": "^2.1.3",
85+
"prettier": "^3.8.3",
86+
"prettier-plugin-ember-template-tag": "^2.1.5",
8787
"qunit": "^2.25.0",
88-
"qunit-dom": "^3.5.0",
88+
"qunit-dom": "^3.5.1",
8989
"stylelint": "^16.26.1",
9090
"stylelint-config-standard": "^38.0.0",
91-
"testem": "^3.17.0<% if (typescript) { %>",
91+
"testem": "^3.20.0<% if (typescript) { %>",
9292
"typescript": "^5.9.3",
93-
"typescript-eslint": "^8.56.0<% } %>",
94-
"vite": "^7.3.1"
93+
"typescript-eslint": "^8.58.2<% } %>",
94+
"vite": "^7.3.2"
9595
},
9696
"engines": {
9797
"node": ">= 20.19.0"

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ember/app-blueprint",
3-
"version": "7.0.0-alpha.2",
3+
"version": "7.1.0-alpha.0",
44
"description": "Blueprint for next generation of Ember apps",
55
"keywords": [
66
"ember-blueprint"
@@ -52,7 +52,8 @@
5252
"release-plan": "^0.17.2",
5353
"strip-ansi": "^7.1.0",
5454
"tmp-promise": "^3.0.3",
55-
"vitest": "^4.0.0-beta.17"
55+
"vitest": "^4.0.0-beta.17",
56+
"vitest-matrix": "^0.2.0"
5657
},
5758
"packageManager": "[email protected]"
5859
}

‎pnpm-lock.yaml‎

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)