Merge pull request #286 from ember-cli/merge-release

Prepare Beta Release

Author: mansona

CHANGELOG.md

@@ -1,22 +1,53 @@
 # Changelog
 
-## Release (2026-04-18)
+## Release (2026-05-20)
 
-* @ember/app-blueprint 7.0.0-beta.1 (minor)
+* @ember/app-blueprint 7.0.1 (patch)
 
-#### :rocket: Enhancement
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#284](https://github.com/ember-cli/ember-app-blueprint/pull/284) update ember-cli dependency to 7.0 ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2026-05-15)
+
+* @ember/app-blueprint 7.0.0 (major)
+
+#### :boom: Breaking Change
 * `@ember/app-blueprint`
-  * [#254](https://github.com/ember-cli/ember-app-blueprint/pull/254) Prepare 7.0 Beta ([@mansona](https://github.com/mansona))
+  * [#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))
 
 #### :house: Internal
 * `@ember/app-blueprint`
   * [#249](https://github.com/ember-cli/ember-app-blueprint/pull/249) fix 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: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
 
+## Release (2026-05-05)
+
+* @ember/app-blueprint 6.12.3 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#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))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2026-05-05)
+
+* @ember/app-blueprint 6.12.2 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#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))
+
+#### Committers: 1
+- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))
+
 ## Release (2026-04-18)
 
 * @ember/app-blueprint 6.12.1 (patch)

RELEASE.md

@@ -49,7 +49,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
 - Update blueprint dependencies to latest
 
   ```
-  pnpm dlx update-blueprint-deps --ember-source latest files/package.json
+  pnpm dlx update-blueprint-deps --filter 'ember-source' --tag latest files/package.json
+  pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
   ```
 
 - 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
 - Update ember-cli
 
   ```
-  pnpm dlx update-blueprint-deps --filter ember-cli --tag latest files/package.json
+  pnpm dlx update-blueprint-deps --filter ember-cli --tag latest package.json files/package.json
   ```
 - commit this update `git commit -am "update ember-cli dependency to latest"`
 - 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
 - Update blueprint dependencies to beta
 
   ```
-  pnpm dlx update-blueprint-deps --filter ember-source --tag beta files/package.json
+  pnpm dlx update-blueprint-deps --filter ember-source --tag beta package.json files/package.json
+  pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
   ```
 
 - 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
 - Update blueprint dependencies to alpha
 
   ```
-  pnpm dlx update-blueprint-deps --filter ember-source --tag alpha files/package.json
+  pnpm dlx update-blueprint-deps --filter ember-source --tag alpha package.json files/package.json
+  pnpm dlx update-blueprint-deps --filter '.*' package.json files/package.json
   ```
 
 - 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
 - Merge the `Prepare Alpha Release` when you are ready to release the next alpha version
 - Check the `Release Alpha` GitHub action to make sure the release succeeded
 
+### Update all packages
+
+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.
+
+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:
+
+```
+pnpm dlx update-blueprint-deps --filter '.*' --tag latest package.json files/package.json
+```
+
+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.
+
+```
+pnpm dlx update-blueprint-deps --filter 'walk-sync' --tag latest package.json files/package.json
+```
+
 
 ### Release ember-cli and update ember-cli versions
 

files/package.json

@@ -36,15 +36,15 @@
     "@babel/plugin-transform-runtime": "^7.29.0<% if (typescript) { %>",
     "@babel/plugin-transform-typescript": "^7.28.6<% } %>",
     "@babel/eslint-parser": "^7.28.6<% if (typescript) { %>",
-    "@ember/app-tsconfig": "^1.0.3<% } %>",
+    "@ember/app-tsconfig": "^2.0.0<% } %>",
     "@ember/optional-features": "^3.0.0",
     "@ember/string": "^4.0.1",
-    "@ember/test-helpers": "^5.4.1",
+    "@ember/test-helpers": "^5.4.2",
     "@ember/test-waiters": "^4.1.1",
     "@embroider/macros": "^1.20.2",
     "@embroider/core": "^4.4.7",
     "@embroider/vite": "^1.7.2",
-    "@embroider/compat": "^4.1.17",
+    "@embroider/compat": "^4.1.18",
     "@embroider/router": "^3.0.6",
     "@embroider/config-meta-loader": "^1.0.0",
     "@embroider/legacy-inspector-support": "^0.1.3",
@@ -53,26 +53,26 @@
     "@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",
+    "@rollup/plugin-babel": "^7.0.0<% if (typescript) { %>",
+    "@types/qunit": "^2.19.14",
     "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
     "@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",
+    "babel-plugin-ember-template-compilation": "^4.0.0",
     "concurrently": "^9.2.1",
-    "decorator-transforms": "^2.3.1",
-    "ember-cli": "~6.12.0",
+    "decorator-transforms": "^2.3.2",
+    "ember-cli": "~7.0.0",
     "ember-cli-babel": "^8.3.1",
-    "ember-cli-deprecation-workflow": "^3.4.0",
+    "ember-cli-deprecation-workflow": "^4.0.1",
     "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.2.0",
-    "ember-source": "~7.0.0-beta.1",
+    "ember-source": "~7.1.0-beta.1",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^8.0.5<% } %>",
     "eslint": "^9.39.4",
@@ -83,15 +83,15 @@
     "eslint-plugin-warp-drive": "^5.8.2<% } %>",
     "globals": "^16.5.0",
     "prettier": "^3.8.3",
-    "prettier-plugin-ember-template-tag": "^2.1.5",
+    "prettier-plugin-ember-template-tag": "^2.1.6",
     "qunit": "^2.25.0",
     "qunit-dom": "^3.5.1",
-    "stylelint": "^16.26.1",
-    "stylelint-config-standard": "^38.0.0",
+    "stylelint": "^17.11.0",
+    "stylelint-config-standard": "^40.0.0",
     "testem": "^3.20.0<% if (typescript) { %>",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.58.2<% } %>",
-    "vite": "^7.3.2"
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.3<% } %>",
+    "vite": "^8.0.12"
   },
   "engines": {
     "node": ">= 20.19.0"

index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const stringUtil = require('ember-cli-string-utils');
-const chalk = require('chalk');
+const { styleText } = require('node:util');
 const directoryForPackageName = require('./lib/directory-for-package-name');
 const { sortPackageJson } = require('sort-package-json');
 const { join } = require('path');
@@ -65,8 +65,13 @@ module.exports = {
     let name = stringUtil.dasherize(rawName);
     let namespace = stringUtil.classify(rawName);
 
+    const warpDrive = options.warpDrive ?? options.emberData;
+
     let hasOptions =
-      !options.welcome || options.packageManager || options.ciProvider;
+      !options.welcome ||
+      options.packageManager ||
+      options.ciProvider ||
+      !warpDrive;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -80,8 +85,7 @@ module.exports = {
           options.packageManager === 'pnpm' && '"--pnpm"',
           options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
           options.typescript && `"--typescript"`,
-          !options.emberData && `"--no-ember-data"`,
-          !options.warpDrive && `"--no-warp-drive"`,
+          warpDrive === false && `"--no-warp-drive"`,
         ]
           .filter(Boolean)
           .join(',\n            ') +
@@ -117,7 +121,7 @@ module.exports = {
       blueprint: 'app',
       blueprintOptions,
       lang: options.lang,
-      warpDrive: options.warpDrive ?? options.emberData,
+      warpDrive,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
@@ -170,7 +174,7 @@ module.exports = {
     this.ui.writeLine(
       prependEmoji(
         '✨',
-        `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`,
+        `Creating a new Ember app in ${styleText('yellow', process.cwd())}:`,
       ),
     );
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "7.0.0-beta.1",
+  "version": "7.1.0-beta.0",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -30,29 +30,28 @@
     "publishTag": "beta"
   },
   "dependencies": {
-    "chalk": "^4.1.2",
     "ejs": "^3.1.10",
     "ember-cli-string-utils": "^1.1.0",
-    "lodash": "^4.17.21",
-    "sort-package-json": "^3.6.0",
-    "walk-sync": "^3.0.0"
+    "lodash": "^4.18.1",
+    "sort-package-json": "^3.6.1",
+    "walk-sync": "^4.0.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.3.0",
-    "concurrently": "^9.1.2",
-    "ember-cli": "^6.3.1",
+    "@eslint/js": "^9.39.4",
+    "concurrently": "^9.2.1",
+    "ember-cli": "^7.0.0",
     "eslint": "9.x",
-    "eslint-config-prettier": "^9.1.0",
-    "execa": "^9.1.0",
+    "eslint-config-prettier": "^9.1.2",
+    "execa": "^9.6.1",
     "fixturify": "^3.0.0",
-    "globals": "^15.3.0",
+    "globals": "^15.15.0",
     "jsonc-parser": "^3.3.1",
-    "prettier": "^3.2.5",
-    "prettier-plugin-ember-template-tag": "^2.0.2",
-    "release-plan": "^0.17.2",
-    "strip-ansi": "^7.1.0",
+    "prettier": "^3.8.3",
+    "prettier-plugin-ember-template-tag": "^2.1.6",
+    "release-plan": "^0.17.4",
+    "strip-ansi": "^7.2.0",
     "tmp-promise": "^3.0.3",
-    "vitest": "^4.0.0-beta.17",
+    "vitest": "^4.1.6",
     "vitest-matrix": "^0.2.0"
   },
   "packageManager": "pnpm@10.20.0"