Skip to content

Commit 237db3a

Browse files
committed
Merge branch 'origin/main' into beta
# Conflicts: # CHANGELOG.md # files/package.json # package.json # pnpm-lock.yaml
2 parents 8f4e770 + d111845 commit 237db3a

5 files changed

Lines changed: 35 additions & 20 deletions

File tree

RELEASE.md

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
4949
- Update blueprint dependencies to latest
5050

5151
```
52-
pnpm dlx update-blueprint-deps --ember-source latest files/package.json
52+
pnpm dlx update-blueprint-deps --filter 'ember-source' --tag latest files/package.json
53+
pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
5354
```
5455

5556
- commit this update `git commit -am "update blueprint dependencies to latest"`
@@ -70,7 +71,7 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
7071
- Update ember-cli
7172

7273
```
73-
pnpm dlx update-blueprint-deps --filter ember-cli --tag latest files/package.json
74+
pnpm dlx update-blueprint-deps --filter ember-cli --tag latest package.json files/package.json
7475
```
7576
- commit this update `git commit -am "update ember-cli dependency to latest"`
7677
- push and open a PR targeting `release` with a PR title like `Update ember-cli to 6.4`
@@ -103,7 +104,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
103104
- Update blueprint dependencies to beta
104105

105106
```
106-
pnpm dlx update-blueprint-deps --filter ember-source --tag beta files/package.json
107+
pnpm dlx update-blueprint-deps --filter ember-source --tag beta package.json files/package.json
108+
pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
107109
```
108110

109111
- commit this update `git commit -am "update blueprint dependencies to beta"`
@@ -133,7 +135,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
133135
- Update blueprint dependencies to alpha
134136

135137
```
136-
pnpm dlx update-blueprint-deps --filter ember-source --tag alpha files/package.json
138+
pnpm dlx update-blueprint-deps --filter ember-source --tag alpha package.json files/package.json
139+
pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
137140
```
138141

139142
- commit this update `git commit -am "update blueprint dependencies to alpha"`
@@ -147,6 +150,22 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
147150
- Merge the `Prepare Alpha Release` when you are ready to release the next alpha version
148151
- Check the `Release Alpha` GitHub action to make sure the release succeeded
149152

153+
### Update all packages
154+
155+
In the `update-blueprint-deps` steps described above we updated all packages that had in-range updates available. We also need to apply any out-of-range updates as part of the release process.
156+
157+
Once the Alpha release has been completed we should run the following command to see if there are any releases that have out-of-range updates available:
158+
159+
```
160+
pnpm dlx update-blueprint-deps --filter '.*' --tag latest package.json files/package.json
161+
```
162+
163+
This is not intended to be committed and opened as a single PR, it is for illustrative purposes only. If your git diff shows that there are any packages that need to have the range updated (i.e. we have a `^` dependency defined but there is a new major release available) then you should run the same command to update that package with a filter on the package name e.g.
164+
165+
```
166+
pnpm dlx update-blueprint-deps --filter 'walk-sync' --tag latest package.json files/package.json
167+
```
168+
150169

151170
### Release ember-cli and update ember-cli versions
152171

files/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
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) { %>",
39-
"@ember/app-tsconfig": "^1.0.3<% } %>",
39+
"@ember/app-tsconfig": "^2.0.0<% } %>",
4040
"@ember/optional-features": "^3.0.0",
4141
"@ember/string": "^4.0.1",
4242
"@ember/test-helpers": "^5.4.2",
@@ -61,12 +61,12 @@
6161
"@warp-drive/json-api": "~5.8.2",
6262
"@warp-drive/legacy": "~5.8.2",
6363
"@warp-drive/utilities": "~5.8.2<% } %>",
64-
"babel-plugin-ember-template-compilation": "^3.1.0",
64+
"babel-plugin-ember-template-compilation": "^4.0.0",
6565
"concurrently": "^9.2.1",
6666
"decorator-transforms": "^2.3.2",
6767
"ember-cli": "~7.0.0",
6868
"ember-cli-babel": "^8.3.1",
69-
"ember-cli-deprecation-workflow": "^3.4.0",
69+
"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",
@@ -86,10 +86,10 @@
8686
"prettier-plugin-ember-template-tag": "^2.1.5",
8787
"qunit": "^2.25.0",
8888
"qunit-dom": "^3.5.1",
89-
"stylelint": "^16.26.1",
90-
"stylelint-config-standard": "^38.0.0",
89+
"stylelint": "^17.8.0",
90+
"stylelint-config-standard": "^40.0.0",
9191
"testem": "^3.20.0<% if (typescript) { %>",
92-
"typescript": "^5.9.3",
92+
"typescript": "^6.0.3",
9393
"typescript-eslint": "^8.59.2<% } %>",
9494
"vite": "^8.0.11"
9595
},

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const stringUtil = require('ember-cli-string-utils');
4-
const chalk = require('chalk');
4+
const { styleText } = require('node:util');
55
const directoryForPackageName = require('./lib/directory-for-package-name');
66
const { sortPackageJson } = require('sort-package-json');
77
const { join } = require('path');
@@ -174,7 +174,7 @@ module.exports = {
174174
this.ui.writeLine(
175175
prependEmoji(
176176
'✨',
177-
`Creating a new Ember app in ${chalk.yellow(process.cwd())}:`,
177+
`Creating a new Ember app in ${styleText('yellow', process.cwd())}:`,
178178
),
179179
);
180180
},

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ember/app-blueprint",
3-
"version": "7.0.0-beta.1",
3+
"version": "7.1.0-beta.0",
44
"description": "Blueprint for next generation of Ember apps",
55
"keywords": [
66
"ember-blueprint"
@@ -30,12 +30,11 @@
3030
"publishTag": "beta"
3131
},
3232
"dependencies": {
33-
"chalk": "^4.1.2",
3433
"ejs": "^3.1.10",
3534
"ember-cli-string-utils": "^1.1.0",
3635
"lodash": "^4.18.1",
3736
"sort-package-json": "^3.6.1",
38-
"walk-sync": "^3.0.0"
37+
"walk-sync": "^4.0.1"
3938
},
4039
"devDependencies": {
4140
"@eslint/js": "^9.39.4",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)