Skip to content

Commit 9ff9bba

Browse files
mansonamansona
authored
Merge pull request #288 from ember-cli/merge-beta
Prepare 7.2 Alpha
2 parents d111845 + ced02dc commit 9ff9bba

4 files changed

Lines changed: 1291 additions & 2140 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
# Changelog
22

3-
## Release (2026-04-28)
3+
## Release (2026-05-20)
44

5-
* @ember/app-blueprint 7.1.0-alpha.4 (patch)
5+
* @ember/app-blueprint 7.1.0-beta.1 (minor)
6+
7+
#### :rocket: Enhancement
8+
* `@ember/app-blueprint`
9+
* [#286](https://github.com/ember-cli/ember-app-blueprint/pull/286) Prepare Beta Release ([@mansona](https://github.com/mansona))
10+
* [#266](https://github.com/ember-cli/ember-app-blueprint/pull/266) remove chalk in favour of native styleText ([@mansona](https://github.com/mansona))
11+
* [#267](https://github.com/ember-cli/ember-app-blueprint/pull/267) update walk-sync to v4 ([@mansona](https://github.com/mansona))
12+
* [#260](https://github.com/ember-cli/ember-app-blueprint/pull/260) update stylelint to v17 ([@mansona](https://github.com/mansona))
13+
* [#264](https://github.com/ember-cli/ember-app-blueprint/pull/264) update ember-cli-deprecation-workflow to v4 ([@mansona](https://github.com/mansona))
14+
* [#263](https://github.com/ember-cli/ember-app-blueprint/pull/263) update vite to v8 ([@mansona](https://github.com/mansona))
15+
* [#262](https://github.com/ember-cli/ember-app-blueprint/pull/262) update babel-plugin-ember-template-compilation to v4 ([@mansona](https://github.com/mansona))
16+
* [#261](https://github.com/ember-cli/ember-app-blueprint/pull/261) update @rollup/plugin-babel to v7 ([@mansona](https://github.com/mansona))
17+
* [#258](https://github.com/ember-cli/ember-app-blueprint/pull/258) update typescript to v6 ([@mansona](https://github.com/mansona))
618

719
#### :bug: Bug Fix
820
* `@ember/app-blueprint`
@@ -16,66 +28,53 @@
1628
- Chris Manson ([@mansona](https://github.com/mansona))
1729
- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))
1830

19-
## Release (2026-04-26)
31+
## Release (2026-05-20)
2032

21-
* @ember/app-blueprint 7.1.0-alpha.3 (minor)
33+
* @ember/app-blueprint 7.0.1 (patch)
2234

23-
#### :rocket: Enhancement
35+
#### :bug: Bug Fix
2436
* `@ember/app-blueprint`
25-
* [#266](https://github.com/ember-cli/ember-app-blueprint/pull/266) remove chalk in favour of native styleText ([@mansona](https://github.com/mansona))
26-
* [#267](https://github.com/ember-cli/ember-app-blueprint/pull/267) update walk-sync to v4 ([@mansona](https://github.com/mansona))
37+
* [#284](https://github.com/ember-cli/ember-app-blueprint/pull/284) update ember-cli dependency to 7.0 ([@mansona](https://github.com/mansona))
2738

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

31-
## Release (2026-04-20)
42+
## Release (2026-05-15)
3243

33-
* @ember/app-blueprint 7.1.0-alpha.2 (minor)
44+
* @ember/app-blueprint 7.0.0 (major)
3445

35-
#### :rocket: Enhancement
46+
#### :boom: Breaking Change
3647
* `@ember/app-blueprint`
37-
* [#260](https://github.com/ember-cli/ember-app-blueprint/pull/260) update stylelint to v17 ([@mansona](https://github.com/mansona))
38-
* [#264](https://github.com/ember-cli/ember-app-blueprint/pull/264) update ember-cli-deprecation-workflow to v4 ([@mansona](https://github.com/mansona))
39-
* [#263](https://github.com/ember-cli/ember-app-blueprint/pull/263) update vite to v8 ([@mansona](https://github.com/mansona))
40-
* [#262](https://github.com/ember-cli/ember-app-blueprint/pull/262) update babel-plugin-ember-template-compilation to v4 ([@mansona](https://github.com/mansona))
41-
* [#261](https://github.com/ember-cli/ember-app-blueprint/pull/261) update @rollup/plugin-babel to v7 ([@mansona](https://github.com/mansona))
42-
* [#258](https://github.com/ember-cli/ember-app-blueprint/pull/258) update typescript to v6 ([@mansona](https://github.com/mansona))
48+
* [#279](https://github.com/ember-cli/ember-app-blueprint/pull/279) Promote Beta and update all dependencies for 7.0 release ([@mansona](https://github.com/mansona))
49+
50+
#### :house: Internal
51+
* `@ember/app-blueprint`
52+
* [#249](https://github.com/ember-cli/ember-app-blueprint/pull/249) fix publish ([@mansona](https://github.com/mansona))
4353

4454
#### Committers: 1
4555
- Chris Manson ([@mansona](https://github.com/mansona))
4656

47-
## Release (2026-04-20)
57+
## Release (2026-05-05)
4858

49-
* @ember/app-blueprint 7.1.0-alpha.1 (minor)
59+
* @ember/app-blueprint 6.12.3 (patch)
5060

51-
#### :rocket: Enhancement
52-
* `@ember/app-blueprint`
53-
* [#256](https://github.com/ember-cli/ember-app-blueprint/pull/256) Prepare 7.1 Alpha ([@mansona](https://github.com/mansona))
54-
55-
#### :house: Internal
61+
#### :bug: Bug Fix
5662
* `@ember/app-blueprint`
57-
* [#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))
58-
* [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))
63+
* [#276](https://github.com/ember-cli/ember-app-blueprint/pull/276) [backport release] update vite to v8 and @rollup/plugin-babel to v7 ([@mansona](https://github.com/mansona))
5964

6065
#### Committers: 1
6166
- Chris Manson ([@mansona](https://github.com/mansona))
6267

63-
## Release (2026-04-18)
68+
## Release (2026-05-05)
6469

65-
* @ember/app-blueprint 7.0.0-beta.1 (minor)
70+
* @ember/app-blueprint 6.12.2 (patch)
6671

67-
#### :rocket: Enhancement
72+
#### :bug: Bug Fix
6873
* `@ember/app-blueprint`
69-
* [#254](https://github.com/ember-cli/ember-app-blueprint/pull/254) Prepare 7.0 Beta ([@mansona](https://github.com/mansona))
70-
71-
#### :house: Internal
72-
* `@ember/app-blueprint`
73-
* [#249](https://github.com/ember-cli/ember-app-blueprint/pull/249) fix publish ([@mansona](https://github.com/mansona))
74-
* [#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))
75-
* [#244](https://github.com/ember-cli/ember-app-blueprint/pull/244) split tests into individual matrix jobs ([@mansona](https://github.com/mansona))
74+
* [#274](https://github.com/ember-cli/ember-app-blueprint/pull/274) Fix an issue with the `--no-warp-drive` option ([@Windvis](https://github.com/Windvis))
7675

7776
#### Committers: 1
78-
- Chris Manson ([@mansona](https://github.com/mansona))
77+
- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))
7978

8079
## Release (2026-04-18)
8180

‎files/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
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.1",
42+
"@ember/test-helpers": "^5.4.2",
4343
"@ember/test-waiters": "^4.1.1",
4444
"@embroider/macros": "^1.20.2",
4545
"@embroider/core": "^4.4.7",
4646
"@embroider/vite": "^1.7.2",
47-
"@embroider/compat": "^4.1.17",
47+
"@embroider/compat": "^4.1.18",
4848
"@embroider/router": "^3.0.6",
4949
"@embroider/config-meta-loader": "^1.0.0",
5050
"@embroider/legacy-inspector-support": "^0.1.3",
@@ -54,7 +54,7 @@
5454
"@glint/template": "^1.7.7",
5555
"@glint/tsserver-plugin": "^2.4.0<% } %>",
5656
"@rollup/plugin-babel": "^7.0.0<% if (typescript) { %>",
57-
"@types/qunit": "^2.19.13",
57+
"@types/qunit": "^2.19.14",
5858
"@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
5959
"@warp-drive/core": "~5.8.2",
6060
"@warp-drive/ember": "~5.8.2",
@@ -63,16 +63,16 @@
6363
"@warp-drive/utilities": "~5.8.2<% } %>",
6464
"babel-plugin-ember-template-compilation": "^4.0.0",
6565
"concurrently": "^9.2.1",
66-
"decorator-transforms": "^2.3.1",
67-
"ember-cli": "~6.12.0",
66+
"decorator-transforms": "^2.3.2",
67+
"ember-cli": "~7.0.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",
7373
"ember-qunit": "^9.0.4",
7474
"ember-resolver": "^13.2.0",
75-
"ember-source": "~7.1.0-alpha.2",
75+
"ember-source": "~7.2.0-alpha.1",
7676
"ember-template-lint": "^7.9.3<% if (welcome) { %>",
7777
"ember-welcome-page": "^8.0.5<% } %>",
7878
"eslint": "^9.39.4",
@@ -83,15 +83,15 @@
8383
"eslint-plugin-warp-drive": "^5.8.2<% } %>",
8484
"globals": "^16.5.0",
8585
"prettier": "^3.8.3",
86-
"prettier-plugin-ember-template-tag": "^2.1.5",
86+
"prettier-plugin-ember-template-tag": "^2.1.6",
8787
"qunit": "^2.25.0",
8888
"qunit-dom": "^3.5.1",
89-
"stylelint": "^17.8.0",
89+
"stylelint": "^17.11.0",
9090
"stylelint-config-standard": "^40.0.0",
9191
"testem": "^3.20.0<% if (typescript) { %>",
9292
"typescript": "^6.0.3",
93-
"typescript-eslint": "^8.58.2<% } %>",
94-
"vite": "^8.0.9"
93+
"typescript-eslint": "^8.59.3<% } %>",
94+
"vite": "^8.0.12"
9595
},
9696
"engines": {
9797
"node": ">= 20.19.0"

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ember/app-blueprint",
3-
"version": "7.1.0-alpha.4",
3+
"version": "7.2.0-alpha.0",
44
"description": "Blueprint for next generation of Ember apps",
55
"keywords": [
66
"ember-blueprint"
@@ -32,26 +32,26 @@
3232
"dependencies": {
3333
"ejs": "^3.1.10",
3434
"ember-cli-string-utils": "^1.1.0",
35-
"lodash": "^4.17.21",
36-
"sort-package-json": "^3.6.0",
35+
"lodash": "^4.18.1",
36+
"sort-package-json": "^3.6.1",
3737
"walk-sync": "^4.0.1"
3838
},
3939
"devDependencies": {
40-
"@eslint/js": "^9.3.0",
41-
"concurrently": "^9.1.2",
42-
"ember-cli": "^6.3.1",
40+
"@eslint/js": "^9.39.4",
41+
"concurrently": "^9.2.1",
42+
"ember-cli": "^7.0.0",
4343
"eslint": "9.x",
44-
"eslint-config-prettier": "^9.1.0",
45-
"execa": "^9.1.0",
44+
"eslint-config-prettier": "^9.1.2",
45+
"execa": "^9.6.1",
4646
"fixturify": "^3.0.0",
47-
"globals": "^15.3.0",
47+
"globals": "^15.15.0",
4848
"jsonc-parser": "^3.3.1",
49-
"prettier": "^3.2.5",
50-
"prettier-plugin-ember-template-tag": "^2.0.2",
51-
"release-plan": "^0.17.2",
52-
"strip-ansi": "^7.1.0",
49+
"prettier": "^3.8.3",
50+
"prettier-plugin-ember-template-tag": "^2.1.6",
51+
"release-plan": "^0.17.4",
52+
"strip-ansi": "^7.2.0",
5353
"tmp-promise": "^3.0.3",
54-
"vitest": "^4.0.0-beta.17",
54+
"vitest": "^4.1.6",
5555
"vitest-matrix": "^0.2.0"
5656
},
5757
"packageManager": "pnpm@10.20.0"

0 commit comments

Comments
 (0)