Skip to content

Commit eb64bc5

Browse files
mansonamansona
authored
Merge pull request #305 from ember-cli/merge-beta
Prepare 7.3 Alpha
2 parents df4eaae + a96194e commit eb64bc5

7 files changed

Lines changed: 457 additions & 349 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
name: Create Prepare Release PR
4949
with:
5050
commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
51-
labels: "internal"
51+
labels: internal, ignore
5252
sign-commits: true
5353
branch: release-preview
5454
title: Prepare Alpha Release ${{ steps.explanation.outputs.new-version }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
name: Create Prepare Release PR
4949
with:
5050
commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
51-
labels: "internal"
51+
labels: internal, ignore
5252
sign-commits: true
5353
branch: release-preview-beta
5454
title: Prepare Beta Release ${{ steps.explanation.outputs.new-version }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
name: Create Prepare Release PR
4949
with:
5050
commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
51-
labels: "internal"
51+
labels: internal, ignore
5252
sign-commits: true
5353
branch: release-preview-stable
5454
title: Prepare Stable Release ${{ steps.explanation.outputs.new-version }}

‎CHANGELOG.md‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,51 @@
11
# Changelog
22

3-
## Release (2026-06-30)
3+
## Release (2026-07-03)
44

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

77
#### :rocket: Enhancement
88
* `@ember/app-blueprint`
9+
* [#303](https://github.com/ember-cli/ember-app-blueprint/pull/303) Prepare 7.2 Beta ([@mansona](https://github.com/mansona))
910
* [#147](https://github.com/ember-cli/ember-app-blueprint/pull/147) Apply `typescript-eslint`'s recommended config to gts files ([@bendemboski](https://github.com/bendemboski))
1011

12+
#### :bug: Bug Fix
13+
* `@ember/app-blueprint`
14+
* [#299](https://github.com/ember-cli/ember-app-blueprint/pull/299) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
15+
16+
#### :memo: Documentation
17+
* `@ember/app-blueprint`
18+
* [#300](https://github.com/ember-cli/ember-app-blueprint/pull/300) Update RELEASE.md ([@mansona](https://github.com/mansona))
19+
1120
#### :house: Internal
1221
* `@ember/app-blueprint`
22+
* [#298](https://github.com/ember-cli/ember-app-blueprint/pull/298) fix plan release for beta and stable ([@mansona](https://github.com/mansona))
23+
* [#297](https://github.com/ember-cli/ember-app-blueprint/pull/297) fix release-plan plan CI ([@mansona](https://github.com/mansona))
1324
* [#291](https://github.com/ember-cli/ember-app-blueprint/pull/291) update release-plan ([@mansona](https://github.com/mansona))
1425
* [#281](https://github.com/ember-cli/ember-app-blueprint/pull/281) Update RELEASE.md ([@mansona](https://github.com/mansona))
1526

1627
#### Committers: 2
1728
- Ben Demboski ([@bendemboski](https://github.com/bendemboski))
1829
- Chris Manson ([@mansona](https://github.com/mansona))
1930

20-
## Release (2026-05-21)
31+
## Release (2026-07-02)
2132

22-
* @ember/app-blueprint 7.2.0-alpha.1 (minor)
33+
* @ember/app-blueprint 7.1.1 (patch)
2334

24-
#### :rocket: Enhancement
35+
#### :bug: Bug Fix
2536
* `@ember/app-blueprint`
26-
* [#288](https://github.com/ember-cli/ember-app-blueprint/pull/288) Prepare 7.2 Alpha ([@mansona](https://github.com/mansona))
37+
* [#299](https://github.com/ember-cli/ember-app-blueprint/pull/299) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
2738

2839
#### Committers: 1
2940
- Chris Manson ([@mansona](https://github.com/mansona))
3041

31-
## Release (2026-05-20)
42+
## Release (2026-06-30)
3243

33-
* @ember/app-blueprint 7.1.0-beta.1 (minor)
44+
* @ember/app-blueprint 7.1.0 (minor)
3445

3546
#### :rocket: Enhancement
3647
* `@ember/app-blueprint`
37-
* [#286](https://github.com/ember-cli/ember-app-blueprint/pull/286) Prepare Beta Release ([@mansona](https://github.com/mansona))
48+
* [#295](https://github.com/ember-cli/ember-app-blueprint/pull/295) Promote Beta and update all dependencies for 7.1 release ([@mansona](https://github.com/mansona))
3849
* [#266](https://github.com/ember-cli/ember-app-blueprint/pull/266) remove chalk in favour of native styleText ([@mansona](https://github.com/mansona))
3950
* [#267](https://github.com/ember-cli/ember-app-blueprint/pull/267) update walk-sync to v4 ([@mansona](https://github.com/mansona))
4051
* [#260](https://github.com/ember-cli/ember-app-blueprint/pull/260) update stylelint to v17 ([@mansona](https://github.com/mansona))
@@ -50,6 +61,8 @@
5061

5162
#### :house: Internal
5263
* `@ember/app-blueprint`
64+
* [#298](https://github.com/ember-cli/ember-app-blueprint/pull/298) fix plan release for beta and stable ([@mansona](https://github.com/mansona))
65+
* [#297](https://github.com/ember-cli/ember-app-blueprint/pull/297) fix release-plan plan CI ([@mansona](https://github.com/mansona))
5366
* [#253](https://github.com/ember-cli/ember-app-blueprint/pull/253) Update RELEASE.md with notes from the latest release ([@mansona](https://github.com/mansona))
5467

5568
#### Committers: 2

‎files/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,29 @@
3131
"./*": "./app/*"
3232
},
3333
"devDependencies": {
34-
"@babel/core": "^7.29.0",
35-
"@babel/runtime": "^7.29.2",
36-
"@babel/plugin-transform-runtime": "^7.29.0<% if (typescript) { %>",
37-
"@babel/plugin-transform-typescript": "^7.28.6<% } %>",
38-
"@babel/eslint-parser": "^7.28.6<% if (typescript) { %>",
34+
"@babel/core": "^7.29.7",
35+
"@babel/runtime": "^7.29.7",
36+
"@babel/plugin-transform-runtime": "^7.29.7<% if (typescript) { %>",
37+
"@babel/plugin-transform-typescript": "^7.29.7<% } %>",
38+
"@babel/eslint-parser": "^7.29.7<% if (typescript) { %>",
3939
"@ember/app-tsconfig": "^2.0.0<% } %>",
4040
"@ember/optional-features": "^3.0.0",
4141
"@ember/string": "^4.0.1",
42-
"@ember/test-helpers": "^5.4.2",
43-
"@ember/test-waiters": "^4.1.1",
44-
"@embroider/macros": "^1.20.2",
45-
"@embroider/core": "^4.4.7",
46-
"@embroider/vite": "^1.7.2",
47-
"@embroider/compat": "^4.1.18",
42+
"@ember/test-helpers": "^5.4.3",
43+
"@ember/test-waiters": "^4.1.2",
44+
"@embroider/macros": "^1.20.5",
45+
"@embroider/core": "^4.6.2",
46+
"@embroider/vite": "^1.7.8",
47+
"@embroider/compat": "^4.1.21",
4848
"@embroider/router": "^3.0.6",
4949
"@embroider/config-meta-loader": "^1.0.0",
5050
"@embroider/legacy-inspector-support": "^0.1.3",
5151
"@eslint/js": "^9.39.4",
5252
"@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<% } %>",
56-
"@rollup/plugin-babel": "^7.0.0<% if (typescript) { %>",
53+
"@glint/ember-tsc": "^1.8.2",
54+
"@glint/template": "^1.7.8",
55+
"@glint/tsserver-plugin": "^2.5.8<% } %>",
56+
"@rollup/plugin-babel": "^7.1.0<% if (typescript) { %>",
5757
"@types/qunit": "^2.19.14",
5858
"@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
5959
"@warp-drive/core": "~5.8.2",
@@ -62,17 +62,17 @@
6262
"@warp-drive/legacy": "~5.8.2",
6363
"@warp-drive/utilities": "~5.8.2<% } %>",
6464
"babel-plugin-ember-template-compilation": "^4.0.0",
65-
"concurrently": "^9.2.1",
66-
"decorator-transforms": "^2.3.2",
67-
"ember-cli": "~7.0.0",
65+
"concurrently": "^9.2.3",
66+
"decorator-transforms": "^2.4.0",
67+
"ember-cli": "~7.1.0",
6868
"ember-cli-babel": "^8.3.1",
6969
"ember-cli-deprecation-workflow": "^4.0.1",
7070
"ember-load-initializers": "^3.0.1",
7171
"ember-modifier": "^4.3.0",
7272
"ember-page-title": "^9.0.3",
73-
"ember-qunit": "^9.0.4",
73+
"ember-qunit": "^9.1.0",
7474
"ember-resolver": "^13.2.0",
75-
"ember-source": "~7.2.0-alpha.1",
75+
"ember-source": "~7.3.0-alpha.1",
7676
"ember-template-lint": "^7.9.3<% if (welcome) { %>",
7777
"ember-welcome-page": "^8.0.5<% } %>",
7878
"eslint": "^9.39.4",
@@ -82,16 +82,16 @@
8282
"eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>",
8383
"eslint-plugin-warp-drive": "^5.8.2<% } %>",
8484
"globals": "^16.5.0",
85-
"prettier": "^3.8.3",
85+
"prettier": "^3.8.5",
8686
"prettier-plugin-ember-template-tag": "^2.1.6",
87-
"qunit": "^2.25.0",
87+
"qunit": "^2.26.0",
8888
"qunit-dom": "^3.5.1",
89-
"stylelint": "^17.11.0",
89+
"stylelint": "^17.14.0",
9090
"stylelint-config-standard": "^40.0.0",
91-
"testem": "^3.20.0<% if (typescript) { %>",
91+
"testem": "^3.20.1<% if (typescript) { %>",
9292
"typescript": "^6.0.3",
93-
"typescript-eslint": "^8.59.3<% } %>",
94-
"vite": "^8.0.12"
93+
"typescript-eslint": "^8.62.0<% } %>",
94+
"vite": "^8.1.0"
9595
},
9696
"engines": {
9797
"node": ">= 20.19.0"

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ember/app-blueprint",
3-
"version": "7.2.0-alpha.2",
3+
"version": "7.3.0-alpha.0",
44
"description": "Blueprint for next generation of Ember apps",
55
"keywords": [
66
"ember-blueprint"
@@ -25,25 +25,25 @@
2525
"ejs": "^3.1.10",
2626
"ember-cli-string-utils": "^1.1.0",
2727
"lodash": "^4.18.1",
28-
"sort-package-json": "^3.6.1",
29-
"walk-sync": "^4.0.1"
28+
"sort-package-json": "^3.7.1",
29+
"walk-sync": "^4.0.2"
3030
},
3131
"devDependencies": {
3232
"@eslint/js": "^9.39.4",
33-
"concurrently": "^9.2.1",
34-
"ember-cli": "^7.0.0",
33+
"concurrently": "^9.2.3",
34+
"ember-cli": "^7.1.0",
3535
"eslint": "9.x",
3636
"eslint-config-prettier": "^9.1.2",
3737
"execa": "^9.6.1",
3838
"fixturify": "^3.0.0",
3939
"globals": "^15.15.0",
4040
"jsonc-parser": "^3.3.1",
41-
"prettier": "^3.8.3",
41+
"prettier": "^3.8.5",
4242
"prettier-plugin-ember-template-tag": "^2.1.6",
4343
"release-plan": "^0.18.0",
4444
"strip-ansi": "^7.2.0",
4545
"tmp-promise": "^3.0.3",
46-
"vitest": "^4.1.6",
46+
"vitest": "^4.1.9",
4747
"vitest-matrix": "^0.2.0"
4848
},
4949
"packageManager": "pnpm@10.20.0",

0 commit comments

Comments
 (0)