ember-cli 6.5.0-beta.0 → 6.6.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # ember-cli Changelog
 
+## Release (2025-06-11)
+
+* ember-cli 6.6.0-alpha.2 (minor)
+
+#### :rocket: Enhancement
+* `ember-cli`
+  * [#10701](https://github.com/ember-cli/ember-cli/pull/10701) [ENHANCEMENT] Support Bun ([@hexadecy](https://github.com/hexadecy))
+  * [#10664](https://github.com/ember-cli/ember-cli/pull/10664) [ENHANCEMENT] Remove ember-fetch ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `ember-cli`
+  * [#10711](https://github.com/ember-cli/ember-cli/pull/10711) fix yuidoc generation on publish ([@mansona](https://github.com/mansona))
+  * [#10710](https://github.com/ember-cli/ember-cli/pull/10710) make sure we release alpha with release-plan ([@mansona](https://github.com/mansona))
+  * [#10702](https://github.com/ember-cli/ember-cli/pull/10702) [Bugfix]: Update ember-data and unify the versions between @ and non-@ ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* `ember-cli`
+  * [#10709](https://github.com/ember-cli/ember-cli/pull/10709) Prepare Alpha Release v6.6.0-alpha.1 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#10699](https://github.com/ember-cli/ember-cli/pull/10699) Start using release-plan for releasing ember-cli ([@mansona](https://github.com/mansona))
+  * [#10670](https://github.com/ember-cli/ember-cli/pull/10670) testing: don't generate temp directories in the repo ([@mansona](https://github.com/mansona))
+
+#### Committers: 4
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Michel Couillard ([@hexadecy](https://github.com/hexadecy))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [@github-actions[bot]](https://github.com/apps/github-actions)
+
+## Release (2025-06-11)
+
+* ember-cli 6.6.0-alpha.1 (minor)
+
+#### :rocket: Enhancement
+* `ember-cli`
+  * [#10701](https://github.com/ember-cli/ember-cli/pull/10701) [ENHANCEMENT] Support Bun ([@hexadecy](https://github.com/hexadecy))
+  * [#10664](https://github.com/ember-cli/ember-cli/pull/10664) [ENHANCEMENT] Remove ember-fetch ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `ember-cli`
+  * [#10710](https://github.com/ember-cli/ember-cli/pull/10710) make sure we release alpha with release-plan ([@mansona](https://github.com/mansona))
+  * [#10702](https://github.com/ember-cli/ember-cli/pull/10702) [Bugfix]: Update ember-data and unify the versions between @ and non-@ ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* `ember-cli`
+  * [#10699](https://github.com/ember-cli/ember-cli/pull/10699) Start using release-plan for releasing ember-cli ([@mansona](https://github.com/mansona))
+  * [#10670](https://github.com/ember-cli/ember-cli/pull/10670) testing: don't generate temp directories in the repo ([@mansona](https://github.com/mansona))
+
+#### Committers: 3
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Michel Couillard ([@hexadecy](https://github.com/hexadecy))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## v6.5.0-beta.0
 
 #### Blueprint Changes

package/RELEASE.md

@@ -1,178 +1,104 @@
 # Release Process
 
-ember-cli follows the same channel based release process that Ember does:
+> [!WARNING]
+> This release process is currently changing and is making its way from the `master` branch to `beta` and `release` as part of the normal release train. Be careful following this document over the next 12 weeks.
+> As of time of writing release-plan is only being used for the master branch and the instructions below are for illustrative purposes only
+
+`ember-cli` follows the same channel based release process that Ember does:
 
 * `release` - This branch represents the `latest` dist-tag on NPM
 * `beta` - This branch represents the `beta` dist-tag on NPM
-* `master` - The branch is not released to the NPM registry, but (generally speaking) can be used directly
-
-## Initial Stable Release
+* `master` - The branch represents the `alpha` dist-tag on NPM
 
-* Update blueprint dependencies to latest
+Most changes should be made as a PR that targets the `master` branch and make their way through `beta` and `release` over the course of 12 weeks as part of the Ember release train. Generally speaking we do not backport functional changes to `beta` or `release` but we can if needs be.
 
-```
-node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=latest
-```
+This release process is managed by [release-plan](https://github.com/embroider-build/release-plan) which means that all changes should be made as a pull request to make sure it is captured in the changelog.
 
-* Commit
-* Send pull request to `beta` branch
-* Wait for PR (for updating blueprint dependencies) to be merged
+## Release process overview
 
-* Checkout the `release` branch
+During the release week each of the versions are effectively "promoted" i.e. the current `beta` version is released as `latest`, the current `alpha` version is released as `beta` and a **new** `alpha` version is created. This requires PRs to each of the active branches to update ember-source (and potentially ember-data) versions. Each of those PRs that update dependencies should be marked as `enhancement` if we are releasing a minor version.
 
-```
-git fetch origin
-git checkout -B release --track origin/release
-```
+The release process during release week should look like this:
 
-* Merge `beta` branch into `release`
+- Do an intial stable release from the `release` branch
+- Merge `release` into `beta`
+- Do a `beta` release
+- Merge `beta` into `master`
+- Do an `alpha` release
 
-```
-git fetch origin
-git merge origin/beta
-git push origin release
-```
 
-* Ensure you have the correct dependencies
 
-```
-git clean -fdx
-pnpm install
-```
-
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Merge any prior beta entries together
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `release` into `beta` branch
-
-```
-git checkout -B beta --track origin/beta
-git merge origin/release
-git push origin beta
-```
-
-## Stable Patch Release
-
-* Checkout the `release` branch
-
-```
-git fetch origin
-git checkout -B release --track origin/release
-```
+### Initial Stable Release from the `release` branch
 
-* Ensure you have the correct dependencies
+- fetch latest from origin `git fetch`
+- create a new branch to do the release e.g. `git checkout -B release-plan-6-4 origin/release`
+  - note: branches named like `release-6-4` are used to manage LTS patch releases so we don't want to create a branch with that name at this time
+- Update blueprint dependencies to latest
 
 ```
-git clean -fdx
-pnpm install
+node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=latest
 ```
 
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `release` into `beta` branch
-
-```
-git checkout -B beta --track origin/beta
-git merge origin/release
-git push origin beta
-```
+- push and open a PR targeting `release`
+- mark this PR as an `enhancement` if it is a minor release
+- check that everything is ok
+- merge branch
+- check that the `Prepare Release` PR has been correctly opened by `release-plan`
+- Merge the `Prepare Release` branch when you are ready to release
+- Check the `Release Stable` GitHub action to make sure the release succeeded
 
-## Initial Beta Release
+### Beta release from the `beta` branch
 
-* Update `ember-source` and `ember-data` to latest beta
+- fetch latest from origin `git fetch`
+- create a new branch to merge `release` into `beta` e.g. `git checkout -B merge-release origin/beta`
+- merge release into this new branch e.g. `git merge origin/release --no-ff`
+- Update blueprint dependencies to beta
 
 ```
 node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=beta
 ```
 
-* Commit
-* Send pull request to `master` branch
-* Wait for PR (for updating blueprint dependencies) to be merged
-* Checkout the `beta` branch
+- push and open a PR targeting `beta`
+- mark this PR as an `enchancement` if the next beta is a minor release
+- check that everything is ok i.e. CI passes
+- merge the `merge-release` branch into `beta` in GitHub
+- check that the `Prepare Beta Release` PR has been correctly opened by `release-plan`
+  - note: the release-plan config will automatically make this version a pre-release
+- Merge the `Prepare Beta Release` when you are ready to release the next beta version
+- Check the `Release Beta` GitHub action to make sure the release succeeded
 
-```
-git fetch origin
-git checkout -B beta --track origin/beta
-```
-
-* Merge `master` branch into `beta`
 
-```
-git fetch origin
-git merge origin/master
-git push origin beta
-```
+### Alpha release from the `master` branch
 
-* Ensure you have the correct dependencies
+- fetch latest from origin `git fetch`
+- create a new branch to merge `beta` into `master` e.g. `git checkout -B merge-beta origin/master`
+- merge release into this new branch e.g. `git merge origin/beta --no-ff`
+- Update blueprint dependencies to alpha
 
 ```
-git clean -fdx
-pnpm install
+node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=canary
 ```
 
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `beta` into `master` branch
+- push and open a PR targeting `master`
+- mark this PR as an `enchancement` if the next alpha is a minor release
+- check that everything is ok i.e. CI passes
+- merge the `merge-beta` branch into `master` in GitHub
+- check that the `Prepare Alpha Release` PR has been correctly opened by `release-plan`
+  - note: the release-plan config will automatically make this version a pre-release
+- 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
 
-```
-git checkout master
-git merge origin/beta
-git push origin master
-```
 
-## Subsequent Beta Release
+## Changelog updates
 
-* Checkout the `beta` branch
+`release-plan` is designed to automatically generate a Changelog that includes the titles of every PR that was merged since the last release. As we would like to make use of this auto-generated Changelog we need to make sure that PRs are named correctly and the Changelog included in the "Prepare Release" PRs are what we were expecting.
 
-```
-git fetch origin
-git checkout -B beta --track origin/beta
-```
+If you want to change the content of the Changelog then you should update the PR titles you want to update and re-run the `Prepare Release` CI job for that branch
 
-* Ensure you have the correct dependencies
+## Patch Releases
 
-```
-git clean -fdx
-pnpm install
-```
-
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `beta` into `master` branch
+Now that we're using release-plan for all releases, patch releases have become super easy! Every time you merge a PR to any branch that is being released with `release-plan` a new `Prepare Release` PR will be created. When you merge this `Prepare Release` branch it will automatically release the new Patch version.
 
-```
-git checkout master
-git merge origin/beta
-git push origin master
-```
 
 ## Post-release Automation
 

package/blueprints/addon/index.js

@@ -79,7 +79,6 @@ module.exports = {
         delete contents.devDependencies[depName];
       }
     }
-    delete contents.devDependencies['ember-fetch'];
 
     // Per RFC #811, addons should not have this dependency.
     // @see https://github.com/emberjs/rfcs/blob/master/text/0811-element-modifiers.md#detailed-design

package/blueprints/app/files/package.json

@@ -31,16 +31,16 @@
     "@babel/core": "^7.27.1",
     "@babel/eslint-parser": "^7.27.1",
     "@babel/plugin-proposal-decorators": "^7.27.1<% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.3.13",
-    "@ember-data/graph": "~5.3.13",
-    "@ember-data/json-api": "~5.3.13",
-    "@ember-data/legacy-compat": "~5.3.13",
-    "@ember-data/model": "~5.3.13",
-    "@ember-data/request": "~5.3.13",
-    "@ember-data/request-utils": "~5.3.13",
-    "@ember-data/serializer": "~5.3.13",
-    "@ember-data/store": "~5.3.13",
-    "@ember-data/tracking": "~5.3.13<% } %>",
+    "@ember-data/adapter": "~5.5.0",
+    "@ember-data/graph": "~5.5.0",
+    "@ember-data/json-api": "~5.5.0",
+    "@ember-data/legacy-compat": "~5.5.0",
+    "@ember-data/model": "~5.5.0",
+    "@ember-data/request": "~5.5.0",
+    "@ember-data/request-utils": "~5.5.0",
+    "@ember-data/serializer": "~5.5.0",
+    "@ember-data/store": "~5.5.0",
+    "@warp-drive/ember": "~5.5.0<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/test-helpers": "^5.2.1<% if (embroider) { %>",
     "@embroider/compat": "^3.9.0",
@@ -70,8 +70,7 @@
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>",
-    "ember-data": "~5.4.1-beta.1<% } %>",
-    "ember-fetch": "^8.1.2",
+    "ember-data": "~5.5.0<% } %>",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
     "ember-page-title": "^9.0.1",

package/blueprints/app/files/tsconfig.json

@@ -25,7 +25,7 @@
       "@ember-data/request-utils/unstable-preview-types",
       "@ember-data/model/unstable-preview-types",
       "@ember-data/serializer/unstable-preview-types",
-      "@ember-data/tracking/unstable-preview-types",
+      "@warp-drive/ember/unstable-preview-types",
       "@warp-drive/core-types/unstable-preview-types<% } %>"
     ]
   }