ember-cli 6.7.0-beta.1 → 6.8.0-alpha.2

package/CHANGELOG.md

@@ -1,43 +1,146 @@
 # ember-cli Changelog
 
-## Release (2025-08-01)
+## Release (2025-09-01)
 
-* @ember-tooling/classic-build-addon-blueprint 6.7.0-beta.1 (minor)
-* @ember-tooling/classic-build-app-blueprint 6.7.0-beta.1 (minor)
-* ember-cli 6.7.0-beta.1 (patch)
+* @ember-tooling/classic-build-addon-blueprint 6.8.0-alpha.2 (minor)
+* @ember-tooling/classic-build-app-blueprint 6.8.0-alpha.2 (minor)
+* ember-cli 6.8.0-alpha.2 (patch)
+
+#### :rocket: Enhancement
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10791](https://github.com/ember-cli/ember-cli/pull/10791) update the format of the ember-cli-update.json ([@mansona](https://github.com/mansona))
+* Other
+  * [#10785](https://github.com/ember-cli/ember-cli/pull/10785) Depracate passing filenames and globs to `init` ([@pichfl](https://github.com/pichfl))
+  * [#10776](https://github.com/ember-cli/ember-cli/pull/10776) Add deprecation warning for the `--embroider` argument ([@pichfl](https://github.com/pichfl))
+
+#### :bug: Bug Fix
+* Other
+  * [#10782](https://github.com/ember-cli/ember-cli/pull/10782) update heimdall-fs-monitor ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-app-blueprint`
+  * [#10707](https://github.com/ember-cli/ember-cli/pull/10707) Enabled recommended configs from eslint-plugin-n and eslint-plugin-qunit ([@ijlee2](https://github.com/ijlee2))
+
+#### :house: Internal
+* [#10790](https://github.com/ember-cli/ember-cli/pull/10790) Reorganize tests for `new` and `addon` commands ([@pichfl](https://github.com/pichfl))
+* [#10783](https://github.com/ember-cli/ember-cli/pull/10783) remove unused changelog script ([@mansona](https://github.com/mansona))
+* [#10764](https://github.com/ember-cli/ember-cli/pull/10764) fix double CI run on release-plan PR ([@mansona](https://github.com/mansona))
+* [#10750](https://github.com/ember-cli/ember-cli/pull/10750) Add more notes to the Release.md ([@mansona](https://github.com/mansona))
+
+#### Committers: 3
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Florian Pichler ([@pichfl](https://github.com/pichfl))
+- Isaac Lee ([@ijlee2](https://github.com/ijlee2))
+
+## Release (2025-08-02)
+
+* @ember-tooling/classic-build-addon-blueprint 6.8.0-alpha.1 (minor)
+* @ember-tooling/classic-build-app-blueprint 6.8.0-alpha.1 (minor)
+* ember-cli 6.8.0-alpha.1 (patch)
 
 #### :rocket: Enhancement
 * `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
   * [#10755](https://github.com/ember-cli/ember-cli/pull/10755) Prepare 6.7-beta ([@mansona](https://github.com/mansona))
+* Other
+  * [#10751](https://github.com/ember-cli/ember-cli/pull/10751) [BETA BACKPORT] Backport drop node 18 ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10763](https://github.com/ember-cli/ember-cli/pull/10763) Prepare 6.8-alpha ([@mansona](https://github.com/mansona))
+  * [#10754](https://github.com/ember-cli/ember-cli/pull/10754) Prepare Beta Release ([@github-actions[bot]](https://github.com/apps/github-actions))
+* Other
+  * [#10761](https://github.com/ember-cli/ember-cli/pull/10761) update release-plan ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- [@github-actions[bot]](https://github.com/apps/github-actions)
+
+## Release (2025-07-26)
+
+* @ember-tooling/classic-build-addon-blueprint 6.7.0-alpha.4 (minor)
+* @ember-tooling/classic-build-app-blueprint 6.7.0-alpha.4 (minor)
+* ember-cli 6.7.0-alpha.4 (patch)
+
+#### :rocket: Enhancement
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10742](https://github.com/ember-cli/ember-cli/pull/10742) Drop node 18, add node 24 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
   * [#10742](https://github.com/ember-cli/ember-cli/pull/10742) Drop node 18, add node 24 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
 
 #### :memo: Documentation
-* [#10724](https://github.com/ember-cli/ember-cli/pull/10724) Update RELEASE.md to fully document new release-plan setup ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10742](https://github.com/ember-cli/ember-cli/pull/10742) Drop node 18, add node 24 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* [#10748](https://github.com/ember-cli/ember-cli/pull/10748) update blueprint version of ember-cli as part of release plan ([@mansona](https://github.com/mansona))
+* [#10747](https://github.com/ember-cli/ember-cli/pull/10747) only use the PAT for the PR creation in release-plan ([@mansona](https://github.com/mansona))
+* [#10744](https://github.com/ember-cli/ember-cli/pull/10744) run tests on the release-plan PR ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+## Release (2025-06-30)
+
+* @ember-tooling/classic-build-addon-blueprint 6.7.0-alpha.3 (patch)
+* @ember-tooling/classic-build-app-blueprint 6.7.0-alpha.3 (patch)
+* @ember-tooling/blueprint-blueprint 0.0.2 (patch)
+* @ember-tooling/blueprint-model 0.0.2 (patch)
+* ember-cli 6.7.0-alpha.3 (patch)
+
+#### :house: Internal
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
+  * [#10738](https://github.com/ember-cli/ember-cli/pull/10738) add a repository for each of the packages ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2025-06-30)
+
+* @ember-tooling/classic-build-addon-blueprint 6.7.0-alpha.2 (patch)
+* @ember-tooling/classic-build-app-blueprint 6.7.0-alpha.2 (patch)
+* @ember-tooling/blueprint-blueprint 0.0.1 (patch)
+* @ember-tooling/blueprint-model 0.0.1 (patch)
+* ember-cli 6.7.0-alpha.2 (patch)
 
 #### :house: Internal
 * Other
-  * [#10761](https://github.com/ember-cli/ember-cli/pull/10761) update release-plan ([@mansona](https://github.com/mansona))
-  * [#10748](https://github.com/ember-cli/ember-cli/pull/10748) update blueprint version of ember-cli as part of release plan ([@mansona](https://github.com/mansona))
-  * [#10747](https://github.com/ember-cli/ember-cli/pull/10747) only use the PAT for the PR creation in release-plan ([@mansona](https://github.com/mansona))
-  * [#10744](https://github.com/ember-cli/ember-cli/pull/10744) run tests on the release-plan PR ([@mansona](https://github.com/mansona))
   * [#10735](https://github.com/ember-cli/ember-cli/pull/10735) remove unnecessary project override ([@mansona](https://github.com/mansona))
-* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
-  * [#10738](https://github.com/ember-cli/ember-cli/pull/10738) add a repository for each of the packages ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
   * [#10736](https://github.com/ember-cli/ember-cli/pull/10736) update all sub-packages to have the @ember-tooling prefix ([@mansona](https://github.com/mansona))
   * [#10671](https://github.com/ember-cli/ember-cli/pull/10671) Implement the built in app, addon, and blueprint blueprints by package lookup ([@mansona](https://github.com/mansona))
 
-#### Committers: 2
+#### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
-- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
 
-## Release (2025-07-29)
+## Release (2025-06-16)
+
+* ember-cli 6.7.0-alpha.1 (minor)
+
+#### :rocket: Enhancement
+* `ember-cli`
+  * [#10705](https://github.com/ember-cli/ember-cli/pull/10705) add `--strict` flag for new app and addon generation ([@mansona](https://github.com/mansona))
 
-* ember-cli 6.6.0 (minor)
+#### :memo: Documentation
+* `ember-cli`
+  * [#10724](https://github.com/ember-cli/ember-cli/pull/10724) Update RELEASE.md to fully document new release-plan setup ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `ember-cli`
+  * [#10731](https://github.com/ember-cli/ember-cli/pull/10731) Prepare Alpha 6.7.0 ([@mansona](https://github.com/mansona))
+  * [#10728](https://github.com/ember-cli/ember-cli/pull/10728) Prepare Beta 6.6.0 ([@mansona](https://github.com/mansona))
+  * [#10726](https://github.com/ember-cli/ember-cli/pull/10726) use patched github-changelog for properly rolling up beta changelog ([@mansona](https://github.com/mansona))
+  * [#10717](https://github.com/ember-cli/ember-cli/pull/10717) pass --publish-branch to release-plan publish ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2025-06-16)
+
+* ember-cli 6.6.0-beta.1 (minor)
 
 #### :rocket: Enhancement
 * `ember-cli`
-  * [#10749](https://github.com/ember-cli/ember-cli/pull/10749) Update all dependencies for 6.6 release ([@mansona](https://github.com/mansona))
-  * [#10751](https://github.com/ember-cli/ember-cli/pull/10751) [BETA BACKPORT] Backport drop node 18 ([@mansona](https://github.com/mansona))
   * [#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))
 
@@ -48,6 +151,8 @@
 
 #### :house: Internal
 * `ember-cli`
+  * [#10728](https://github.com/ember-cli/ember-cli/pull/10728) Prepare Beta 6.6.0 ([@mansona](https://github.com/mansona))
+  * [#10726](https://github.com/ember-cli/ember-cli/pull/10726) use patched github-changelog for properly rolling up beta changelog ([@mansona](https://github.com/mansona))
   * [#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))
 

package/RELEASE.md

@@ -16,12 +16,19 @@ During the release week each of the versions are effectively "promoted" i.e. the
 
 The release process during release week should look like this:
 
+- Merge any outstanding `Prepare Alpha Release` branches
 - 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
 
+### Merge any outstanding `Prepare Alpha Release` branches
+
+This makes sure that you are starting from a "clean slate" before doing any other releases. This will make each of the following steps easier to follow.
+
+You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=is%3Apr+is%3Aopen+Prepare) to find any outstanding `Prepare Release` branches.
+
 
 ### Initial Stable Release from the `release` branch
 
@@ -31,7 +38,11 @@ The release process during release week should look like this:
 - Merge `origin/beta` into the release branch
   - `git merge origin/beta --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
+  - **make sure to not update the .github/workflows/plan-release.yml file** this should still plan a stable release
+  - **make sure to not update the .github/workflows/publish.yml file** this should still publish a stable release
+  - **make sure to not update the CHANGELOG.md file** so as not to include the beta or alpha changelogs in the next release
   - make sure to not update the version in the package.json during this step, this will be release-plan's job
+  - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
 - Update blueprint dependencies to latest
 
 ```
@@ -39,9 +50,9 @@ node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=l
 ```
 
 - commit this update `git commit -am "update blueprint dependencies to latest"`
-- push and open a PR targeting `release`
+- push and open a PR targeting `release` with a PR title like `Update all dependencies for 6.4 release`
 - mark this PR as an `enhancement` if it is a minor release
-- check that everything is ok
+- check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
 - 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
@@ -53,9 +64,18 @@ node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=l
 - create a new branch to merge `release` into `beta` e.g. `git checkout --no-track -b merge-release origin/beta`
 - merge release into this new branch e.g. `git merge origin/release --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
+  - **make sure to not update any .github/workflows/plan-release.yml file** this should still plan a beta release
+  - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release
+  - make sure to not update the version in the package.json during this step, that step comes later
+  - make sure to not remove the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step.
 - merge master into this new branch too e.g. `git merge origin/master --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
+  - **make sure to not update the CHANGELOG.md file** in this step. It should match the changelog on `origin/release` at this stage.
   - update the alpha version in package.json to be a beta i.e. if the incoming merge is `"version": "6.6.0-alpha.3",` update it to `"version": "6.6.0-beta.0",`
+  - update the alpha version in `packages/addon-blueprint/package.json` to be a beta
+  - update the alpha version in `packages/app-blueprint/package.json` to be a beta
+  - make sure not to update the `release-plan` config in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`
+  - update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same as the version you just put in the top level package.json
 - Update blueprint dependencies to beta
 
 ```
@@ -63,7 +83,7 @@ node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=bet
 ```
 
 - commit this update `git commit -am "update blueprint dependencies to beta"`
-- push and open a PR targeting `beta`
+- push and open a PR targeting `beta` with a PR title like `Prepare 6.5-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
@@ -79,8 +99,14 @@ node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=bet
 - create a new branch to merge `beta` into `master` e.g. `git checkout --no-track -b merge-beta origin/master`
 - merge beta into this new branch e.g. `git merge origin/beta --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
-- manually update the version in pacakge.json to be the next alpha.
+  - make sure to not update the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step.
+  - **make sure to not update any .github/workflows/plan-release.yml file** this should still plan a beta release
+  - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release
+  - **make sure to not update the CHANGELOG.md file** in this step.
+- manually update the version in package.json to be the next alpha.
   - e.g. if the current alpha is `"version": "6.6.0-alpha.3",` update it to be `"version": "6.7.0-alpha.0",`
+- manually update the alpha version in `packages/addon-blueprint/package.json` to be the same alpha
+- manually update the alpha version in `packages/app-blueprint/package.json` to be the same alpha
 - commit this change to the version in package.json: `git commit -am "update to the next alpha version"`
 - Update blueprint dependencies to alpha
 
@@ -89,7 +115,7 @@ node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=ca
 ```
 
 - commit this update `git commit -am "update blueprint dependencies to alpha"`
-- push and open a PR targeting `master`
+- push and open a PR targeting `master` with a PR title like `Prepare 6.6-alpha`
 - 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

package/docs/build/data.json

@@ -3,7 +3,7 @@
         "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
         "name": "ember-cli",
         "description": "Command line tool for developing ambitious ember.js apps",
-        "version": "6.7.0-beta.1-beta-5e6c3164af"
+        "version": "6.8.0-alpha.2-master-9842a0708f"
     },
     "files": {
         "lib/broccoli/default-packager.js": {

package/lib/commands/init.js

@@ -10,6 +10,7 @@ const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 const getLangArg = require('../../lib/utilities/get-lang-arg');
+const { deprecate, DEPRECATIONS } = require('../debug');
 
 module.exports = Command.extend({
   name: 'init',
@@ -39,7 +40,12 @@ module.exports = Command.extend({
       type: String,
       description: 'Sets the base human language of the application via index.html',
     },
-    { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
+    {
+      name: 'embroider',
+      type: Boolean,
+      default: false,
+      description: 'Deprecated: Enables the build system to use Embroider',
+    },
     {
       name: 'ci-provider',
       type: ['github', 'none'],
@@ -74,6 +80,12 @@ module.exports = Command.extend({
   beforeRun: mergeBlueprintOptions,
 
   async run(commandOptions, rawArgs) {
+    deprecate(
+      "Don't use `--embroider` option. Use `-b @ember/app-blueprint` instead.",
+      !commandOptions.embroider,
+      DEPRECATIONS.EMBROIDER.options
+    );
+
     if (commandOptions.dryRun) {
       commandOptions.skipNpm = true;
     }
@@ -107,12 +119,20 @@ module.exports = Command.extend({
 
     merge(blueprintOpts, {
       rawName: packageName,
-      targetFiles: rawArgs || '',
+      targetFiles: rawArgs || [],
       rawArgs: rawArgs.toString(),
       blueprint: normalizeBlueprint(blueprintOpts.blueprint || this._defaultBlueprint()),
       ciProvider,
     });
 
+    let { targetFiles } = blueprintOpts;
+
+    deprecate(
+      `Do not pass file names or globs to \`init\`. Passed: "${targetFiles.join(' ')}"`,
+      targetFiles.length === 0,
+      DEPRECATIONS.INIT_TARGET_FILES.options
+    );
+
     if (!isValidProjectName(packageName)) {
       return Promise.reject(new SilentError(`We currently do not support a name of \`${packageName}\`.`));
     }
@@ -142,5 +162,11 @@ module.exports = Command.extend({
     this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(`${commandOptions.packageManager ?? 'npm'} start`)}`);
     this.ui.writeLine('');
     this.ui.writeLine('Happy coding!');
+
+    deprecate(
+      "Don't use `--embroider` option. Use `-b @ember/app-blueprint` instead.",
+      !commandOptions.embroider,
+      DEPRECATIONS.EMBROIDER.options
+    );
   },
 });

package/lib/commands/new.js

@@ -7,6 +7,7 @@ const SilentError = require('silent-error');
 const isValidProjectName = require('../utilities/valid-project-name');
 const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
+const { deprecate, DEPRECATIONS } = require('../debug');
 
 module.exports = Command.extend({
   name: 'new',
@@ -37,7 +38,12 @@ module.exports = Command.extend({
       description: 'Sets the base human language of the application via index.html',
     },
     { name: 'lint-fix', type: Boolean, default: true },
-    { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
+    {
+      name: 'embroider',
+      type: Boolean,
+      default: false,
+      description: 'Deprecated: Enables the build system to use Embroider',
+    },
     {
       name: 'ci-provider',
       type: ['github', 'none'],
@@ -70,6 +76,12 @@ module.exports = Command.extend({
   beforeRun: mergeBlueprintOptions,
 
   async run(commandOptions, rawArgs) {
+    deprecate(
+      "Don't use `--embroider` option. Use `-b @ember/app-blueprint` instead.",
+      !commandOptions.embroider,
+      DEPRECATIONS.EMBROIDER.options
+    );
+
     let projectName = rawArgs[0],
       message;
 
@@ -141,6 +153,12 @@ module.exports = Command.extend({
 
     initCommand.project.root = process.cwd();
 
+    deprecate(
+      "Don't use `--embroider` option. Use `-b @ember/app-blueprint` instead.",
+      !commandOptions.embroider,
+      DEPRECATIONS.EMBROIDER.options
+    );
+
     return await initCommand.run(commandOptions, rawArgs);
   },
 });

package/lib/debug/deprecations.js

@@ -23,6 +23,25 @@ const DEPRECATIONS = {
       types: ['app-prefix', 'app-suffix', 'tests-prefix', 'tests-suffix', 'vendor-prefix', 'vendor-suffix'],
     },
   }),
+  EMBROIDER: deprecation({
+    for: 'ember-cli',
+    id: 'ember-cli.dont-use-embroider-option',
+    since: {
+      available: '6.8.0',
+    },
+    until: '7.0.0',
+    url: 'https://deprecations.emberjs.com/id/dont-use-embroider-option',
+  }),
+
+  INIT_TARGET_FILES: deprecation({
+    for: 'ember-cli',
+    id: 'ember-cli.init-target-files',
+    since: {
+      available: '6.8.0',
+    },
+    until: '7.0.0',
+    url: 'https://deprecations.emberjs.com/id/init-no-file-names',
+  }),
 };
 
 module.exports = DEPRECATIONS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.7.0-beta.1",
+  "version": "6.8.0-alpha.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -31,12 +31,10 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   },
   "dependencies": {
-    "@ember-tooling/blueprint-blueprint": "^0.0.2",
-    "@ember-tooling/blueprint-model": "^0.0.2",
     "@pnpm/find-workspace-dir": "^1000.1.0",
     "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
@@ -81,7 +79,7 @@
     "git-repo-info": "^2.1.1",
     "glob": "^8.1.0",
     "heimdalljs": "^0.2.6",
-    "heimdalljs-fs-monitor": "^1.1.1",
+    "heimdalljs-fs-monitor": "^1.1.2",
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
@@ -119,11 +117,12 @@
     "watch-detector": "^1.0.2",
     "workerpool": "^9.2.0",
     "yam": "^1.0.0",
-    "@ember-tooling/classic-build-addon-blueprint": "6.7.0-beta.1",
-    "@ember-tooling/classic-build-app-blueprint": "6.7.0-beta.1"
+    "@ember-tooling/blueprint-blueprint": "0.0.2",
+    "@ember-tooling/blueprint-model": "0.0.2",
+    "@ember-tooling/classic-build-addon-blueprint": "6.8.0-alpha.2",
+    "@ember-tooling/classic-build-app-blueprint": "6.8.0-alpha.2"
   },
   "devDependencies": {
-    "@octokit/rest": "^19.0.7",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.3.7",

package/packages/addon-blueprint/index.js

@@ -243,7 +243,7 @@ module.exports = {
       npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
       invokeScriptPrefix,
       welcome: options.welcome,
-      blueprint: 'addon',
+      blueprint: '@ember-tooling/classic-build-addon-blueprint',
       blueprintOptions,
       embroider: false,
       lang: options.lang,

package/packages/addon-blueprint/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.7.0-beta.1",
+  "version": "6.8.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/addon-blueprint"
   },
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.0.2",
+    "@ember-tooling/blueprint-model": "workspace:*",
     "chalk": "^4.1.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -22,7 +22,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   }
 }

package/packages/app-blueprint/files/_js_eslint.config.mjs

@@ -69,6 +69,7 @@ export default [
     },
   },
   {
+    ...qunit.configs.recommended,
     files: ['tests/**/*-test.{js,gjs}'],
     plugins: {
       qunit,
@@ -78,6 +79,7 @@ export default [
    * CJS node files
    */
   {
+    ...n.configs['flat/recommended-script'],
     files: [
       '**/*.cjs',
       'config/**/*.js',
@@ -106,6 +108,7 @@ export default [
    * ESM node files
    */
   {
+    ...n.configs['flat/recommended-module'],
     files: ['**/*.mjs'],
     plugins: {
       n,

package/packages/app-blueprint/files/_ts_eslint.config.mjs

@@ -12,6 +12,8 @@
  *     npx eslint --inspect-config
  *
  */
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
 import globals from 'globals';
 import js from '@eslint/js';
 
@@ -42,7 +44,7 @@ const parserOptions = {
     },
     ts: {
       projectService: true,
-      tsconfigRootDir: import.meta.dirname,
+      tsconfigRootDir: dirname(fileURLToPath(import.meta.url)),
     },
   },
 };
@@ -92,6 +94,7 @@ export default ts.config(
     extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
   },
   {
+    ...qunit.configs.recommended,
     files: ['tests/**/*-test.{js,gjs,ts,gts}'],
     plugins: {
       qunit,
@@ -101,6 +104,7 @@ export default ts.config(
    * CJS node files
    */
   {
+    ...n.configs['flat/recommended-script'],
     files: [
       '**/*.cjs',
       'config/**/*.js',
@@ -129,6 +133,7 @@ export default ts.config(
    * ESM node files
    */
   {
+    ...n.configs['flat/recommended-module'],
     files: ['**/*.mjs'],
     plugins: {
       n,

package/packages/app-blueprint/files/config/ember-cli-update.json

@@ -2,13 +2,11 @@
   "schemaVersion": "1.0.0",
   "packages": [
     {
-      "name": "ember-cli",
+      "name": "<%= blueprint %>",
       "version": "<%= blueprintVersion %>",
       "blueprints": [
         {
           "name": "<%= blueprint %>",
-          "outputRepo": "https://github.com/ember-cli/ember-<%= blueprint === 'app' ? 'new' : 'addon' %>-output",
-          "codemodsSource": "ember-<%= blueprint %>-codemods-manifest@1",
           "isBaseBlueprint": true,
           "options": [<%= blueprintOptions %>]
         }

package/packages/app-blueprint/files/package.json

@@ -31,16 +31,16 @@
     "@babel/core": "^7.28.0",
     "@babel/eslint-parser": "^7.28.0",
     "@babel/plugin-proposal-decorators": "^7.28.0<% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.6.0-beta.2",
-    "@ember-data/graph": "~5.6.0-beta.2",
-    "@ember-data/json-api": "~5.6.0-beta.2",
-    "@ember-data/legacy-compat": "~5.6.0-beta.2",
-    "@ember-data/model": "~5.6.0-beta.2",
-    "@ember-data/request": "~5.6.0-beta.2",
-    "@ember-data/request-utils": "~5.6.0-beta.2",
-    "@ember-data/serializer": "~5.6.0-beta.2",
-    "@ember-data/store": "~5.6.0-beta.2",
-    "@warp-drive/ember": "~5.6.0-beta.2<% } %>",
+    "@ember-data/adapter": "~5.7.0-alpha.22",
+    "@ember-data/graph": "~5.7.0-alpha.22",
+    "@ember-data/json-api": "~5.7.0-alpha.22",
+    "@ember-data/legacy-compat": "~5.7.0-alpha.22",
+    "@ember-data/model": "~5.7.0-alpha.22",
+    "@ember-data/request": "~5.7.0-alpha.22",
+    "@ember-data/request-utils": "~5.7.0-alpha.22",
+    "@ember-data/serializer": "~5.7.0-alpha.22",
+    "@ember-data/store": "~5.7.0-alpha.22",
+    "@warp-drive/ember": "~5.7.0-alpha.22<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/test-helpers": "^5.2.2<% if (embroider) { %>",
     "@embroider/compat": "^3.9.1",
@@ -56,11 +56,11 @@
     "@tsconfig/ember": "^3.0.11",
     "@types/qunit": "^2.19.12",
     "@types/rsvp": "^4.0.9<% if (emberData) {%>",
-    "@warp-drive/core-types": "~5.6.0-beta.2<% }} %>",
+    "@warp-drive/core-types": "~5.7.0-alpha.22<% }} %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.0",
     "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.7.0-beta.1",
+    "ember-cli": "~6.8.0-alpha.2",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",
@@ -70,13 +70,13 @@
     "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.6.0-beta.2<% } %>",
+    "ember-data": "~5.7.0-alpha.22<% } %>",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
     "ember-page-title": "^9.0.2",
     "ember-qunit": "^9.0.3",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.7.0-beta.1",
+    "ember-source": "~6.8.0-alpha.2",
     "ember-template-imports": "^4.3.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
@@ -94,7 +94,7 @@
     "stylelint": "^16.23.0",
     "stylelint-config-standard": "^36.0.1",
     "tracked-built-ins": "^3.4.0<% if (typescript) { %>",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "typescript-eslint": "^8.38.0<% } %>",
     "webpack": "^5.101.0"
   },

package/packages/app-blueprint/index.js

@@ -75,7 +75,7 @@ module.exports = {
       invokeScriptPrefix,
       execBinPrefix,
       welcome: options.welcome,
-      blueprint: 'app',
+      blueprint: '@ember-tooling/classic-build-app-blueprint',
       blueprintOptions,
       embroider,
       lang: options.lang,

package/packages/app-blueprint/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.7.0-beta.1",
+  "version": "6.8.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/app-blueprint"
   },
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.0.2",
+    "@ember-tooling/blueprint-model": "workspace:*",
     "chalk": "^4.1.2",
     "ember-cli-string-utils": "^1.1.0"
   },
@@ -16,7 +16,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   }
 }

package/packages/blueprint-blueprint/files/blueprints/__name__/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = {
+  description: ''
+
+  // locals(options) {
+  //   // Return custom template variables here.
+  //   return {
+  //     foo: options.entity.options.foo
+  //   };
+  // }
+
+  // afterInstall(options) {
+  //   // Perform extra work here.
+  // }
+};

package/packages/blueprint-blueprint/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  description: 'Generates a blueprint and definition.',
+};

package/packages/blueprint-blueprint/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@ember-tooling/blueprint-blueprint",
+  "version": "0.0.2",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ember-cli/ember-cli.git",
+    "directory": "packages/blueprint-blueprint"
+  }
+}

package/packages/blueprint-model/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@ember-tooling/blueprint-model",
+  "version": "0.0.2",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ember-cli/ember-cli.git",
+    "directory": "packages/blueprint-model"
+  },
+  "dependencies": {
+    "chalk": "^4.1.2",
+    "diff": "^7.0.0",
+    "isbinaryfile": "^5.0.4",
+    "lodash": "^4.17.21",
+    "promise.hash.helper": "^1.0.8",
+    "quick-temp": "^0.1.8",
+    "silent-error": "^1.1.1"
+  }
+}

package/packages/blueprint-model/utilities/directory-for-package-name.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const path = require('path');
+
+/**
+ * Derive a directory name from a package name.
+ * Takes scoped packages into account.
+ *
+ * @method directoryForPackageName
+ * @param {String} packageName
+ * @return {String} Derived directory name.
+ */
+module.exports = function directoryForPackageName(packageName) {
+  let isScoped = packageName[0] === '@' && packageName.includes('/');
+
+  if (isScoped) {
+    let slashIndex = packageName.indexOf('/');
+    let scopeName = packageName.substring(1, slashIndex);
+    let packageNameWithoutScope = packageName.substring(slashIndex + 1);
+    let pathParts = process.cwd().split(path.sep);
+    let parentDirectoryContainsScopeName = pathParts.includes(scopeName);
+
+    if (parentDirectoryContainsScopeName) {
+      return packageNameWithoutScope;
+    } else {
+      return `${scopeName}-${packageNameWithoutScope}`;
+    }
+  } else {
+    return packageName;
+  }
+};

package/packages/blueprint-model/utilities/edit-file-diff.js

@@ -0,0 +1,64 @@
+'use strict';
+
+const fs = require('fs');
+const util = require('util');
+const jsdiff = require('diff');
+const quickTemp = require('quick-temp');
+const path = require('path');
+const SilentError = require('silent-error');
+const openEditor = require('./open-editor');
+const hash = require('promise.hash.helper');
+
+const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+
+class EditFileDiff {
+  constructor(options) {
+    this.info = options.info;
+
+    quickTemp.makeOrRemake(this, 'tmpDifferenceDir');
+  }
+
+  edit() {
+    return hash({
+      input: this.info.render(),
+      output: readFile(this.info.outputPath),
+    })
+      .then(this.invokeEditor.bind(this))
+      .then(this.applyPatch.bind(this))
+      .finally(this.cleanUp.bind(this));
+  }
+
+  cleanUp() {
+    quickTemp.remove(this, 'tmpDifferenceDir');
+  }
+
+  applyPatch(resultHash) {
+    return hash({
+      diffString: readFile(resultHash.diffPath),
+      currentString: readFile(resultHash.outputPath),
+    }).then((result) => {
+      let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString());
+
+      if (!appliedDiff) {
+        let message = 'Patch was not cleanly applied.';
+        this.info.ui.writeLine(`${message} Please choose another action.`);
+        throw new SilentError(message);
+      }
+
+      return writeFile(resultHash.outputPath, appliedDiff);
+    });
+  }
+
+  invokeEditor(result) {
+    let info = this.info;
+    let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input);
+    let diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff');
+
+    return writeFile(diffPath, diff)
+      .then(() => openEditor(diffPath))
+      .then(() => ({ outputPath: info.outputPath, diffPath }));
+  }
+}
+
+module.exports = EditFileDiff;

package/packages/blueprint-model/utilities/experiments.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const chalk = require('chalk');
+const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC']);
+
+const deprecatedExperiments = Object.freeze([]);
+const enabledExperiments = Object.freeze([]);
+const deprecatedExperimentsDeprecationsIssued = [];
+
+function isExperimentEnabled(experimentName) {
+  if (!availableExperiments.includes(experimentName)) {
+    return false;
+  }
+
+  if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS && deprecatedExperiments.includes(experimentName)) {
+    return false;
+  }
+
+  if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS) {
+    return true;
+  }
+
+  if (process.env.EMBER_CLI_CLASSIC && experimentName === 'EMBROIDER') {
+    return false;
+  }
+
+  let experimentEnvironmentVariable = `EMBER_CLI_${experimentName}`;
+  let experimentValue = process.env[experimentEnvironmentVariable];
+
+  if (deprecatedExperiments.includes(experimentName)) {
+    let deprecationPreviouslyIssued = deprecatedExperimentsDeprecationsIssued.includes(experimentName);
+    let isSpecifiedByUser = experimentValue !== undefined;
+
+    if (!deprecationPreviouslyIssued && isSpecifiedByUser) {
+      console.warn(
+        chalk.yellow(`The ${experimentName} experiment in ember-cli has been deprecated and will be removed.`)
+      );
+      deprecatedExperimentsDeprecationsIssued.push(experimentName);
+    }
+  }
+
+  if (enabledExperiments.includes(experimentName)) {
+    return experimentValue !== 'false';
+  } else {
+    return experimentValue !== undefined && experimentValue !== 'false';
+  }
+}
+
+module.exports = {
+  isExperimentEnabled,
+
+  // exported for testing purposes
+  _deprecatedExperimentsDeprecationsIssued: deprecatedExperimentsDeprecationsIssued,
+};

package/packages/blueprint-model/utilities/file-info.js

@@ -0,0 +1,170 @@
+'use strict';
+
+const fs = require('fs');
+const util = require('util');
+const chalk = require('chalk');
+const EditFileDiff = require('./edit-file-diff');
+const EOL = require('os').EOL;
+const rxEOL = new RegExp(EOL, 'g');
+const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
+const hash = require('promise.hash.helper');
+const canEdit = require('./open-editor').canEdit;
+const processTemplate = require('./process-template');
+
+const readFile = util.promisify(fs.readFile);
+const lstat = util.promisify(fs.stat);
+
+function diffHighlight(line) {
+  if (line[0] === '+') {
+    return chalk.green(line);
+  } else if (line[0] === '-') {
+    return chalk.red(line);
+  } else if (/^@@/.test(line)) {
+    return chalk.cyan(line);
+  } else {
+    return line;
+  }
+}
+
+const NOOP = (_) => _;
+class FileInfo {
+  constructor(options) {
+    this.action = options.action;
+    this.outputBasePath = options.outputBasePath;
+    this.outputPath = options.outputPath;
+    this.displayPath = options.displayPath;
+    this.inputPath = options.inputPath;
+    this.templateVariables = options.templateVariables;
+    this.replacer = options.replacer || NOOP;
+    this.ui = options.ui;
+  }
+
+  confirmOverwrite(path) {
+    let promptOptions = {
+      type: 'expand',
+      name: 'answer',
+      default: false,
+      message: `${chalk.red('Overwrite')} ${path}?`,
+      choices: [
+        { key: 'y', name: 'Yes, overwrite', value: 'overwrite' },
+        { key: 'n', name: 'No, skip', value: 'skip' },
+      ],
+    };
+
+    let outputPathIsFile = false;
+    try {
+      outputPathIsFile = fs.statSync(this.outputPath).isFile();
+    } catch (err) {
+      /* ignore */
+    }
+
+    let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
+
+    if (canDiff) {
+      promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
+
+      if (canEdit()) {
+        promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' });
+      }
+    }
+
+    return this.ui.prompt(promptOptions).then((response) => response.answer);
+  }
+
+  displayDiff() {
+    let info = this,
+      jsdiff = require('diff');
+    return hash({
+      input: this.render(),
+      output: readFile(info.outputPath),
+    }).then((result) => {
+      let diff = jsdiff.createPatch(
+        info.outputPath,
+        result.output.toString().replace(rxEOL, '\n'),
+        result.input.replace(rxEOL, '\n')
+      );
+      let lines = diff.split('\n');
+
+      for (let i = 0; i < lines.length; i++) {
+        info.ui.write(diffHighlight(lines[i] + EOL));
+      }
+    });
+  }
+
+  async render() {
+    if (!this.rendered) {
+      let result = await this._render();
+      this.rendered = this.replacer(result, this);
+    }
+
+    return this.rendered;
+  }
+
+  _render() {
+    let path = this.inputPath;
+    let context = this.templateVariables;
+
+    return readFile(path).then((content) =>
+      lstat(path).then((fileStat) => {
+        if (isBinaryFile(content, fileStat.size)) {
+          return content;
+        } else {
+          try {
+            return processTemplate(content.toString(), context);
+          } catch (err) {
+            err.message += ` (Error in blueprint template: ${path})`;
+            throw err;
+          }
+        }
+      })
+    );
+  }
+
+  checkForConflict() {
+    return this.render().then((input) => {
+      input = input.toString().replace(rxEOL, '\n');
+
+      return readFile(this.outputPath)
+        .then((output) => {
+          output = output.toString().replace(rxEOL, '\n');
+
+          return input === output ? 'identical' : 'confirm';
+        })
+        .catch((e) => {
+          if (e.code === 'ENOENT') {
+            return 'none';
+          }
+
+          throw e;
+        });
+    });
+  }
+
+  confirmOverwriteTask() {
+    let info = this;
+
+    return function () {
+      function doConfirm() {
+        return info.confirmOverwrite(info.displayPath).then((action) => {
+          if (action === 'diff') {
+            return info.displayDiff().then(doConfirm);
+          } else if (action === 'edit') {
+            let editFileDiff = new EditFileDiff({ info });
+            return editFileDiff
+              .edit()
+              .then(() => (info.action = action))
+              .catch(() => doConfirm())
+              .then(() => info);
+          } else {
+            info.action = action;
+            return info;
+          }
+        });
+      }
+
+      return doConfirm();
+    };
+  }
+}
+
+module.exports = FileInfo;

package/packages/blueprint-model/utilities/open-editor.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const spawn = require('child_process').spawn;
+
+function openEditor(file) {
+  if (!openEditor.canEdit()) {
+    throw new Error('EDITOR environment variable is not set');
+  }
+
+  if (!file) {
+    throw new Error('No `file` option provided');
+  }
+
+  let editorArgs = openEditor._env().EDITOR.split(' ');
+  let editor = editorArgs.shift();
+  const args = [file].concat(editorArgs);
+  let editProcess = openEditor._spawn(editor, args, { stdio: 'inherit' });
+
+  return new Promise((resolve, reject) => {
+    editProcess.on('close', (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(
+          new Error(`Spawn('${editor}', [${args.join(',')}]) exited with a non zero error status code: '${code}'`)
+        );
+      }
+    });
+  });
+}
+
+openEditor.canEdit = function () {
+  return openEditor._env().EDITOR !== undefined;
+};
+
+openEditor._env = function () {
+  return process.env;
+};
+
+openEditor._spawn = function () {
+  return spawn.apply(this, arguments);
+};
+
+module.exports = openEditor;

package/packages/blueprint-model/utilities/prepend-emoji.js

@@ -0,0 +1,12 @@
+'use strict';
+
+function supportEmoji() {
+  const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
+  return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
+}
+
+const areEmojiSupported = supportEmoji();
+
+module.exports = function prependEmoji(emoji, msg) {
+  return areEmojiSupported ? `${emoji}  ${msg}` : msg;
+};

package/packages/blueprint-model/utilities/process-template.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = function processTemplate(content, context) {
+  let options = {
+    evaluate: /<%([\s\S]+?)%>/g,
+    interpolate: /<%=([\s\S]+?)%>/g,
+    escape: /<%-([\s\S]+?)%>/g,
+  };
+  return require('lodash/template')(content, options)(context);
+};