ember-cli 6.9.0-alpha.1 → 6.9.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,55 @@
 # ember-cli Changelog
 
+## Release (2025-10-14)
+
+* ember-cli 6.9.0-alpha.2 (minor)
+* @ember-tooling/classic-build-addon-blueprint 6.9.0-alpha.2 (minor)
+* @ember-tooling/classic-build-app-blueprint 6.9.0-alpha.2 (minor)
+* @ember-tooling/blueprint-blueprint 0.2.1 (patch)
+* @ember-tooling/blueprint-model 0.4.1 (patch)
+
+#### :rocket: Enhancement
+* `ember-cli`
+  * [#10844](https://github.com/ember-cli/ember-cli/pull/10844) [beta] Error when `ember (generate|destroy) (http-proxy|http-mock|server)` is used in a Vite-based project ([@kategengler](https://github.com/kategengler))
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10831](https://github.com/ember-cli/ember-cli/pull/10831) [bugfix beta] enable `--strict` by default to match new app blueprint ([@mansona](https://github.com/mansona))
+
+#### :bug: Bug Fix
+* `ember-cli`
+  * [#10846](https://github.com/ember-cli/ember-cli/pull/10846) [beta bugfix] allow build --watch only in EMBROIDER_PREBUILD ([@mansona](https://github.com/mansona))
+  * [#10834](https://github.com/ember-cli/ember-cli/pull/10834) [bugfix release] Fix tests using wrong versions ([@mansona](https://github.com/mansona))
+  * [#10826](https://github.com/ember-cli/ember-cli/pull/10826) move resolution of @ember/app-blueprint to prevent loading latest ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10838](https://github.com/ember-cli/ember-cli/pull/10838) Add package license metadata to match repository ([@davidtaylorhq](https://github.com/davidtaylorhq))
+
+#### :memo: Documentation
+* `ember-cli`
+  * [#10843](https://github.com/ember-cli/ember-cli/pull/10843) Further contextualize help output and error when options and commands that are no longer supported in Vite-based projects are used ([@kategengler](https://github.com/kategengler))
+  * [#10840](https://github.com/ember-cli/ember-cli/pull/10840) [beta] fix help for vite-based projects ([@kategengler](https://github.com/kategengler))
+  * [#10835](https://github.com/ember-cli/ember-cli/pull/10835) Update deprecation message for --embroider option ([@kategengler](https://github.com/kategengler))
+
+#### :house: Internal
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
+  * [#10851](https://github.com/ember-cli/ember-cli/pull/10851) Merge beta into master ([@mansona](https://github.com/mansona))
+  * [#10848](https://github.com/ember-cli/ember-cli/pull/10848) merge origin/release into beta ([@mansona](https://github.com/mansona))
+* `ember-cli`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10847](https://github.com/ember-cli/ember-cli/pull/10847) Prepare Beta Release ([@mansona](https://github.com/mansona))
+  * [#10825](https://github.com/ember-cli/ember-cli/pull/10825) Prepare Beta Release ([@mansona](https://github.com/mansona))
+  * [#10820](https://github.com/ember-cli/ember-cli/pull/10820) Prepare Beta Release ([@mansona](https://github.com/mansona))
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10836](https://github.com/ember-cli/ember-cli/pull/10836) Prepare Beta Release ([@mansona](https://github.com/mansona))
+* `ember-cli`
+  * [#10845](https://github.com/ember-cli/ember-cli/pull/10845) [beta] update @ember/app-blueprint to latest beta ([@mansona](https://github.com/mansona))
+  * [#10833](https://github.com/ember-cli/ember-cli/pull/10833) [bugfix beta] bump the @ember/app-blueprint version ([@mansona](https://github.com/mansona))
+  * [#10823](https://github.com/ember-cli/ember-cli/pull/10823) fix incorrect ember-cli-update version in tests ([@mansona](https://github.com/mansona))
+  * [#10819](https://github.com/ember-cli/ember-cli/pull/10819) update @ember/app-blueprint beta version ([@mansona](https://github.com/mansona))
+  * [#10809](https://github.com/ember-cli/ember-cli/pull/10809) Update RELEASE ([@mansona](https://github.com/mansona))
+
+#### Committers: 3
+- Chris Manson ([@mansona](https://github.com/mansona))
+- David Taylor ([@davidtaylorhq](https://github.com/davidtaylorhq))
+- Katie Gengler ([@kategengler](https://github.com/kategengler))
+
 ## Release (2025-09-17)
 
 * ember-cli 6.9.0-alpha.1 (minor)

package/RELEASE.md

@@ -16,6 +16,7 @@ During the release week each of the versions are effectively "promoted" i.e. the
 
 The release process during release week should look like this:
 
+- Make sure that `@ember/app-blueprint` is released before starting any of these steps
 - Merge any outstanding `Prepare Alpha Release` branches
 - Do an intial stable release from the `release` branch
 - Merge `release` into `beta`
@@ -23,7 +24,7 @@ The release process during release week should look like this:
 - Merge `beta` into `master`
 - Do an `alpha` release
 
-### Merge any outstanding `Prepare Alpha Release` branches
+### 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.
 
@@ -38,19 +39,20 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - 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 .github/workflows/plan-stable-release.yml file** this should still plan a stable release
+  - **make sure to not update the .github/workflows/publish-stable.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 update the version in the `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files 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
+- Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta. 
 
   ```
-  node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=latest
+  node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=<whatever version was in the beta>
   ```
 
 - commit this update `git commit -am "update blueprint dependencies to latest"`
-- push and open a PR targeting `release` with a PR title like `Update all dependencies for 6.4 release`
+- push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release`
 - mark this PR as an `enhancement` if it is a minor release
 - check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
 - merge branch
@@ -64,26 +66,30 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - 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 any .github/workflows/plan-beta-release.yml file** this should still plan a beta release
+  - **make sure to not update any .github/workflows/publish-beta.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.
+  - make sure not to update the `release-plan` config in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`
+  - commit the merge `git commit -am "merge master into beta"`
+- update the versions in package.jsons
   - 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
+  - commit the version changes `git commit -am "update versions"`
 - Update blueprint dependencies to beta
 
   ```
   node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=beta
   ```
 
+- update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@beta`
+- manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json
 - commit this update `git commit -am "update blueprint dependencies to beta"`
-- **TODO**: document how to update @ember/app-blueprint dependency
 - 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
@@ -104,7 +110,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   - **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.
+  - commit this merge
+- 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
@@ -112,11 +119,11 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - Update blueprint dependencies to alpha
 
   ```
-  node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=canary
+  node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=latest
   ```
 
+- update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@alpha`
 - commit this update `git commit -am "update blueprint dependencies to alpha"`
-- **TODO**: document how to update @ember/app-blueprint dependency
 - 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

package/blueprints/http-mock/index.js

@@ -2,9 +2,10 @@
 
 const Blueprint = require('../../lib/models/blueprint');
 const isPackageMissing = require('ember-cli-is-package-missing');
+const SilentError = require('silent-error');
 
 module.exports = {
-  description: 'Generates a mock api endpoint in /api prefix.',
+  description: '[Classic Only] Generates a mock api endpoint in /api prefix.',
 
   anonymousOptions: ['endpoint-path'],
 
@@ -15,6 +16,10 @@ module.exports = {
   },
 
   beforeInstall(options) {
+    if (this.project.isViteProject()) {
+      throw new SilentError('The http-mock blueprint is not supported in Vite projects.');
+    }
+
     let serverBlueprint = Blueprint.lookup('server', {
       ui: this.ui,
       project: this.project,

package/blueprints/http-proxy/index.js

@@ -1,9 +1,10 @@
 'use strict';
 
 const Blueprint = require('../../lib/models/blueprint');
+const SilentError = require('silent-error');
 
 module.exports = {
-  description: 'Generates a relative proxy to another server.',
+  description: '[Classic Only] Generates a relative proxy to another server.',
 
   anonymousOptions: ['local-path', 'remote-url'],
 
@@ -16,6 +17,10 @@ module.exports = {
   },
 
   beforeInstall(options) {
+    if (this.project.isViteProject()) {
+      throw new SilentError('The http-proxy blueprint is not supported in Vite projects.');
+    }
+
     let serverBlueprint = Blueprint.lookup('server', {
       ui: this.ui,
       project: this.project,

package/blueprints/server/index.js

@@ -1,12 +1,19 @@
 'use strict';
 
 const isPackageMissing = require('ember-cli-is-package-missing');
+const SilentError = require('silent-error');
 
 module.exports = {
-  description: 'Generates a server directory for mocks and proxies.',
+  description: '[Classic Only] Generates a server directory for mocks and proxies.',
 
   normalizeEntityName() {},
 
+  beforeInstall() {
+    if (this.project.isViteProject()) {
+      throw new SilentError('The server blueprint is not supported in Vite projects.');
+    }
+  },
+
   afterInstall(options) {
     let isMorganMissing = isPackageMissing(this, 'morgan');
     let isGlobMissing = isPackageMissing(this, 'glob');

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.9.0-alpha.1-master-ac3220f6b8"
+        "version": "6.9.0-alpha.2-master-01a68b9b36"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -5118,6 +5118,16 @@
         {
             "file": "lib/models/command.js",
             "line": 92,
+            "final": 1,
+            "itemtype": "property",
+            "name": "isViteProject",
+            "type": "Boolean",
+            "class": "Command",
+            "module": "ember-cli"
+        },
+        {
+            "file": "lib/models/command.js",
+            "line": 99,
             "description": "The name of the command.",
             "final": 1,
             "itemtype": "property",
@@ -5131,7 +5141,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 104,
+            "line": 111,
             "description": "An array of aliases for the command",
             "final": 1,
             "itemtype": "property",
@@ -5145,7 +5155,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 121,
+            "line": 128,
             "description": "An array of available options for the command",
             "final": 1,
             "itemtype": "property",
@@ -5159,7 +5169,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 141,
+            "line": 148,
             "description": "An array of anonymous options for the command",
             "final": 1,
             "itemtype": "property",
@@ -5173,7 +5183,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 157,
+            "line": 164,
             "description": "Registers options with command. This method provides the ability to extend or override command options.\nExpects an object containing anonymousOptions or availableOptions, which it will then merge with\nexisting availableOptions before building the optionsAliases which are used to define shorthands.",
             "itemtype": "method",
             "name": "registerOptions",
@@ -5189,7 +5199,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 183,
+            "line": 190,
             "description": "Called when command is interrupted from outside, e.g. ctrl+C or process kill\nCan be used to cleanup artifacts produced by command and control process exit code",
             "itemtype": "method",
             "name": "onInterrupt",
@@ -5202,7 +5212,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 210,
+            "line": 217,
             "description": "Looks up for the task and runs\nIt also keeps the reference for the current active task\nKeeping reference for the current task allows to cleanup task on interruption",
             "access": "private",
             "tagname": "",
@@ -5233,7 +5243,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 251,
+            "line": 258,
             "description": "Hook for extending a command before it is run in the cli.run command.\nMost common use case would be to extend availableOptions.",
             "itemtype": "method",
             "name": "beforeRun",
@@ -5246,7 +5256,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 259,
+            "line": 266,
             "itemtype": "method",
             "name": "validateAndRun",
             "return": {
@@ -5258,7 +5268,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 319,
+            "line": 326,
             "description": "Reports if the given command has a command line option by a given name",
             "itemtype": "method",
             "name": "hasOption",
@@ -5278,7 +5288,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 335,
+            "line": 342,
             "description": "Merges any options with duplicate keys in the availableOptions array.\nUsed primarily by registerOptions.",
             "itemtype": "method",
             "name": "mergeDuplicateOption",
@@ -5298,7 +5308,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 370,
+            "line": 377,
             "description": "Normalizes option, filling in implicit values",
             "itemtype": "method",
             "name": "normalizeOption",
@@ -5318,7 +5328,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 382,
+            "line": 389,
             "description": "Assigns option",
             "itemtype": "method",
             "name": "assignOption",
@@ -5348,7 +5358,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 415,
+            "line": 422,
             "description": "Validates option",
             "itemtype": "method",
             "name": "validateOption",
@@ -5368,7 +5378,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 441,
+            "line": 448,
             "description": "Parses alias for an option and adds it to optionsAliases",
             "itemtype": "method",
             "name": "parseAlias",
@@ -5393,7 +5403,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 486,
+            "line": 493,
             "itemtype": "method",
             "name": "assignAlias",
             "params": [
@@ -5415,7 +5425,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 501,
+            "line": 508,
             "description": "Validates alias value",
             "itemtype": "method",
             "name": "validateAlias",
@@ -5435,7 +5445,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 533,
+            "line": 540,
             "description": "Parses command arguments and processes",
             "itemtype": "method",
             "name": "parseArgs",
@@ -5455,7 +5465,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 589,
+            "line": 596,
             "itemtype": "method",
             "name": "run",
             "params": [
@@ -5469,7 +5479,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 599,
+            "line": 606,
             "description": "Prints basic help for the command.\n\nBasic help looks like this:\n\n    ember generate <blueprint> <options...>\n      Generates new code from blueprints\n      aliases: g\n      --dry-run (Default: false)\n      --verbose (Default: false)\n\nThe default implementation is designed to cover all bases\nbut may be overridden if necessary.",
             "itemtype": "method",
             "name": "printBasicHelp",
@@ -5478,7 +5488,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 630,
+            "line": 637,
             "description": "Prints detailed help for the command.\n\nThe default implementation is no-op and should be overridden\nfor each command where further help text is required.",
             "itemtype": "method",
             "name": "printDetailedHelp",
@@ -5487,7 +5497,7 @@
         },
         {
             "file": "lib/models/command.js",
-            "line": 640,
+            "line": 647,
             "itemtype": "method",
             "name": "getJson",
             "params": [
@@ -5773,7 +5783,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 156,
+            "line": 160,
             "description": "Returns the name from package.json.",
             "access": "private",
             "tagname": "",
@@ -5788,8 +5798,8 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 169,
-            "description": "Returns whether or not this is an Ember CLI project.\nThis checks whether ember-cli is listed in devDependencies.",
+            "line": 173,
+            "description": "Returns whether or not this is an Ember CLI project.\nThis checks whether ember-cli is listed in (dev)Dependencies.",
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5803,7 +5813,22 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 181,
+            "line": 185,
+            "description": "Returns whether this is a Vite-based project.\nThis checks whether @embroider/vite is listed in (dev)Dependencies.",
+            "access": "private",
+            "tagname": "",
+            "itemtype": "method",
+            "name": "isViteProject",
+            "return": {
+                "description": "Whether this is a Vite project",
+                "type": "Boolean"
+            },
+            "class": "Project",
+            "module": "ember-cli"
+        },
+        {
+            "file": "lib/models/project.js",
+            "line": 197,
             "description": "Returns whether or not this is an Ember CLI addon.",
             "itemtype": "method",
             "name": "isEmberCLIAddon",
@@ -5816,7 +5841,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 191,
+            "line": 207,
             "description": "Returns the path to the configuration.",
             "access": "private",
             "tagname": "",
@@ -5831,7 +5856,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 208,
+            "line": 224,
             "description": "Loads the configuration for this project and its addons.",
             "access": "public",
             "tagname": "",
@@ -5853,7 +5878,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 227,
+            "line": 243,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5874,7 +5899,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 246,
+            "line": 262,
             "description": "Returns the targets of this project, or the default targets if not present.",
             "access": "public",
             "tagname": "",
@@ -5889,7 +5914,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 273,
+            "line": 289,
             "description": "Returns the addons configuration.",
             "access": "private",
             "tagname": "",
@@ -5916,7 +5941,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 296,
+            "line": 312,
             "description": "Returns whether or not the given file name is present in this project.",
             "access": "private",
             "tagname": "",
@@ -5938,7 +5963,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 308,
+            "line": 324,
             "description": "Resolves the absolute path to a file synchronously",
             "access": "private",
             "tagname": "",
@@ -5960,7 +5985,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 322,
+            "line": 338,
             "description": "Calls `require` on a given module from the context of the project. For\ninstance, an addon may want to require a class from the root project's\nversion of ember-cli.",
             "access": "public",
             "tagname": "",
@@ -5982,7 +6007,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 337,
+            "line": 353,
             "description": "Returns the dependencies from a package.json",
             "access": "private",
             "tagname": "",
@@ -6013,7 +6038,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 357,
+            "line": 373,
             "description": "Provides the list of paths to consult for addons that may be provided\ninternally to this project. Used for middleware addons with built-in support.",
             "access": "private",
             "tagname": "",
@@ -6024,7 +6049,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 383,
+            "line": 399,
             "description": "Discovers all addons for this project and stores their names and\npackage.json contents in this.addonPackages as key-value pairs.\n\nAny packageInfos that we find that are marked as not valid are excluded.",
             "access": "private",
             "tagname": "",
@@ -6035,7 +6060,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 405,
+            "line": 421,
             "description": "Loads and initializes all addons for this project.",
             "access": "private",
             "tagname": "",
@@ -6046,7 +6071,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 426,
+            "line": 442,
             "description": "Returns what commands are made available by addons by inspecting\n`includedCommands` for every addon.",
             "access": "private",
             "tagname": "",
@@ -6061,7 +6086,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 467,
+            "line": 483,
             "description": "Execute a given callback for every addon command.\nExample:\n\n```\nproject.eachAddonCommand(function(addonName, commands) {\n  console.log('Addon ' + addonName + ' exported the following commands:' + commands.keys().join(', '));\n});\n```",
             "access": "private",
             "tagname": "",
@@ -6079,7 +6104,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 490,
+            "line": 506,
             "description": "Path to the blueprints for this project.",
             "access": "private",
             "tagname": "",
@@ -6094,7 +6119,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 501,
+            "line": 517,
             "description": "Returns a list of paths (including addon paths) where blueprints will be looked up.",
             "access": "private",
             "tagname": "",
@@ -6109,7 +6134,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 519,
+            "line": 535,
             "description": "Returns a list of addon paths where blueprints will be looked up.",
             "access": "private",
             "tagname": "",
@@ -6124,7 +6149,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 542,
+            "line": 558,
             "description": "Reloads package.json of the project. Clears and reloads the packageInfo and\nper-bundle addon cache, too.",
             "access": "private",
             "tagname": "",
@@ -6139,7 +6164,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 570,
+            "line": 586,
             "description": "Re-initializes addons.",
             "access": "private",
             "tagname": "",
@@ -6150,7 +6175,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 583,
+            "line": 599,
             "description": "Find an addon by its name",
             "access": "public",
             "tagname": "",
@@ -6172,7 +6197,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 597,
+            "line": 613,
             "description": "Generate test file contents.\n\nThis method is supposed to be overwritten by test framework addons\nlike `ember-qunit`.",
             "access": "public",
             "tagname": "",
@@ -6199,7 +6224,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 621,
+            "line": 637,
             "description": "Returns a new project based on the first `package.json` that is found\nin `pathName`.\n\nIf the above `package.json` specifies `ember-addon.projectRoot`, we load\nthe project based on the relative path between this directory and the\nspecified `projectRoot`.",
             "access": "private",
             "tagname": "",
@@ -6227,7 +6252,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 672,
+            "line": 688,
             "description": "Returns a new project based on the first package.json that is found\nin `pathName`, or the nullProject.\n\nThe nullProject signifies no-project, but abides by the null object pattern",
             "access": "private",
             "tagname": "",
@@ -6250,7 +6275,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 696,
+            "line": 712,
             "description": "Returns the project root based on the first package.json that is found",
             "static": 1,
             "itemtype": "method",

package/lib/commands/addon.js

@@ -41,7 +41,7 @@ module.exports = NewCommand.extend({
     {
       name: 'strict',
       type: Boolean,
-      default: false,
+      default: true,
       description: 'Use GJS/GTS templates by default for generated components, tests, and route templates',
     },
   ],

package/lib/commands/asset-sizes.js

@@ -5,12 +5,20 @@ const Command = require('../models/command');
 module.exports = Command.extend({
   name: 'asset-sizes',
   description: 'Shows the sizes of your asset files.',
+  skipHelp: true,
 
   availableOptions: [
     { name: 'output-path', type: 'Path', default: 'dist/', aliases: ['o'] },
     { name: 'json', type: Boolean, default: false },
   ],
 
+  init() {
+    this._super.apply(this, arguments);
+    if (!this.isViteProject) {
+      this.skipHelp = false;
+    }
+  },
+
   run(commandOptions) {
     return this.runTask('ShowAssetSizes', commandOptions);
   },

package/lib/commands/build.js

@@ -2,10 +2,16 @@
 
 const Command = require('../models/command');
 const Win = require('../utilities/windows-admin');
+const SilentError = require('silent-error');
+
+const ClassicOptions = [
+  { name: 'watch', type: Boolean, default: false, aliases: ['w'] },
+  { name: 'watcher', type: String },
+];
 
 module.exports = Command.extend({
   name: 'build',
-  description: 'Builds your app and places it into the output path (dist/ by default).',
+  description: 'Vestigial command in Vite-based projects. Use the `build` script from package.json instead.',
   aliases: ['b'],
 
   availableOptions: [
@@ -16,13 +22,42 @@ module.exports = Command.extend({
       aliases: ['e', { dev: 'development' }, { prod: 'production' }],
       description: 'Possible values are "development", "production", and "test".',
     },
-    { name: 'output-path', type: 'Path', default: 'dist/', aliases: ['o'] },
-    { name: 'watch', type: Boolean, default: false, aliases: ['w'] },
-    { name: 'watcher', type: String },
     { name: 'suppress-sizes', type: Boolean, default: false },
+    { name: 'output-path', type: 'Path', default: 'dist/', aliases: ['o'] },
   ],
 
+  init() {
+    this._super.apply(this, arguments);
+    if (!this.isViteProject) {
+      this.description = 'Builds your app and places it into the output path (dist/ by default).';
+      this.availableOptions = this.availableOptions.concat(ClassicOptions);
+    } else if (process.env.EMBROIDER_PREBUILD) {
+      // having the --watch option available surpresses a warning that you get in Vite prebuild
+      this.availableOptions = this.availableOptions.concat(ClassicOptions[0]);
+    }
+  },
+
   async run(commandOptions) {
+    if (this.isViteProject && !process.env.EMBROIDER_PREBUILD) {
+      // --watch is used during Embroider prebuild but should never be used directly so we only throw in this case if
+      // EMBROIDER_PREBUILD has been set
+      if (commandOptions.watch) {
+        return Promise.reject(
+          new SilentError(
+            'The `--watch` option to `ember build` is not supported in Vite-based projects. Please use `vite dev` instead.'
+          )
+        );
+      }
+
+      if (commandOptions.watcher) {
+        return Promise.reject(
+          new SilentError(
+            'The `--watcher` option to `ember build` is not supported in Vite-based projects. Please use `vite dev` instead.'
+          )
+        );
+      }
+    }
+
     await Win.checkIfSymlinksNeedToBeEnabled(this.ui);
 
     let buildTaskName = commandOptions.watch ? 'BuildWatch' : 'Build';

package/lib/commands/destroy.js

@@ -6,6 +6,8 @@ const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const merge = require('lodash/merge');
 const SilentError = require('silent-error');
 
+const ClassicOptions = [{ name: 'dummy', type: Boolean, default: false, aliases: ['dum', 'id'] }];
+
 module.exports = Command.extend({
   name: 'destroy',
   description: 'Destroys code generated by `generate` command.',
@@ -17,7 +19,6 @@ module.exports = Command.extend({
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'pod', type: Boolean, default: false, aliases: ['p', 'pods'] },
     { name: 'classic', type: Boolean, default: false, aliases: ['c'] },
-    { name: 'dummy', type: Boolean, default: false, aliases: ['dum', 'id'] },
     { name: 'in-repo-addon', type: String, default: null, aliases: ['in-repo', 'ir'] },
     {
       name: 'in',
@@ -37,9 +38,22 @@ module.exports = Command.extend({
 
   anonymousOptions: ['<blueprint>'],
 
+  init() {
+    this._super.apply(this, arguments);
+    if (!this.isViteProject) {
+      this.availableOptions = this.availableOptions.concat(ClassicOptions);
+    }
+  },
+
   beforeRun: mergeBlueprintOptions,
 
   run(commandOptions, rawArgs) {
+    if (this.isViteProject && commandOptions.dummy) {
+      return Promise.reject(
+        new SilentError('The `--dummy` option to `ember destroy` is not supported in Vite-based projects.')
+      );
+    }
+
     let blueprintName = rawArgs[0];
     let entityName = rawArgs[1];
 

package/lib/commands/generate.js

@@ -15,6 +15,8 @@ const UNKNOWN_BLUEPRINT_ERROR =
   'blueprint name to be specified. ' +
   'For more details, use `ember help`';
 
+const ClassicOptions = [{ name: 'dummy', type: Boolean, default: false, aliases: ['dum', 'id'] }];
+
 module.exports = Command.extend({
   name: 'generate',
   description: 'Generates new code from blueprints.',
@@ -26,7 +28,6 @@ module.exports = Command.extend({
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'pod', type: Boolean, default: false, aliases: ['p', 'pods'] },
     { name: 'classic', type: Boolean, default: false, aliases: ['c'] },
-    { name: 'dummy', type: Boolean, default: false, aliases: ['dum', 'id'] },
     { name: 'in-repo-addon', type: String, default: null, aliases: ['in-repo', 'ir'] },
     { name: 'lint-fix', type: Boolean, default: true },
     {
@@ -46,9 +47,22 @@ module.exports = Command.extend({
 
   anonymousOptions: ['<blueprint>'],
 
+  init() {
+    this._super.apply(this, arguments);
+    if (!this.isViteProject) {
+      this.availableOptions = this.availableOptions.concat(ClassicOptions);
+    }
+  },
+
   beforeRun: mergeBlueprintOptions,
 
   run(commandOptions, rawArgs) {
+    if (this.isViteProject && commandOptions.dummy) {
+      return Promise.reject(
+        new SilentError('The `--dummy` option to `ember generate` is not supported in Vite-based projects.')
+      );
+    }
+
     let blueprintName = rawArgs[0];
 
     if (!blueprintName) {

package/lib/commands/init.js

@@ -12,8 +12,6 @@ const { isPnpmProject, isYarnProject } = require('../utilities/package-managers'
 const getLangArg = require('../../lib/utilities/get-lang-arg');
 const { deprecate, DEPRECATIONS } = require('../debug');
 
-const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilities/experiments');
-
 module.exports = Command.extend({
   name: 'init',
   description: 'Reinitializes a new ember-cli project in the current folder.',
@@ -70,7 +68,7 @@ module.exports = Command.extend({
     {
       name: 'strict',
       type: Boolean,
-      default: false,
+      default: true,
       description: 'Use GJS/GTS templates by default for generated components, tests, and route templates',
     },
   ],
@@ -126,10 +124,6 @@ module.exports = Command.extend({
     let blueprintOpts = clone(commandOptions);
     let blueprint = normalizeBlueprint(blueprintOpts.blueprint || this._defaultBlueprint());
 
-    if (isExperimentEnabled('VITE') && blueprint === 'app') {
-      blueprint = '@ember/app-blueprint';
-    }
-
     merge(blueprintOpts, {
       rawName: packageName,
       targetFiles: rawArgs || [],

package/lib/commands/new.js

@@ -72,7 +72,7 @@ module.exports = Command.extend({
     {
       name: 'strict',
       type: Boolean,
-      default: false,
+      default: true,
       description: 'Use GJS/GTS templates by default for generated components, tests, and route templates',
     },
   ],
@@ -83,7 +83,7 @@ module.exports = Command.extend({
 
   async run(commandOptions, rawArgs) {
     deprecate(
-      "Don't use `--embroider` option. Use `-b @ember/app-blueprint` instead.",
+      "Don't use `--embroider` option. Generating a new project will use the latest Vite-based embroider by default.",
       !commandOptions.embroider,
       DEPRECATIONS.EMBROIDER.options
     );
@@ -160,7 +160,7 @@ module.exports = Command.extend({
     initCommand.project.root = process.cwd();
 
     deprecate(
-      "Don't use `--embroider` option. Use `-b @ember/app-blueprint` instead.",
+      "Don't use `--embroider` option. Generating a new project will use the latest Vite-based embroider by default.",
       !commandOptions.embroider,
       DEPRECATIONS.EMBROIDER.options
     );

package/lib/commands/serve.js

@@ -10,7 +10,8 @@ const DEFAULT_PORT = 4200;
 
 module.exports = Command.extend({
   name: 'serve',
-  description: 'Builds and serves your app, rebuilding on file changes.',
+  description: 'Vestigial command in Vite-based projects. Use the `start` script from package.json instead.',
+  skipHelp: true,
   aliases: ['server', 's'],
 
   availableOptions: [
@@ -88,7 +89,23 @@ module.exports = Command.extend({
     { name: 'path', type: 'Path', description: 'Reuse an existing build at given path.' },
   ],
 
+  init() {
+    this._super.apply(this, arguments);
+    if (!this.isViteProject) {
+      this.skipHelp = false;
+      this.description = 'Builds and serves your app, rebuilding on file changes.';
+    }
+  },
+
   async run(commandOptions) {
+    if (this.isViteProject) {
+      return Promise.reject(
+        new SilentError(
+          'The `serve` command is not supported in Vite-based projects. Please use the `start` script from package.json.'
+        )
+      );
+    }
+
     commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host;
 
     let wrappedCommandOptions = await this._checkOrGetPort(commandOptions);

package/lib/commands/test.js

@@ -16,6 +16,11 @@ temp.track();
 
 let defaultPort = 7357;
 
+const ClassicOptions = [
+  { name: 'server', type: Boolean, default: false, aliases: ['s'] },
+  { name: 'output-path', type: 'Path', aliases: ['o'] },
+];
+
 module.exports = Command.extend({
   name: 'test',
   description: "Runs your app's test suite.",
@@ -30,7 +35,6 @@ module.exports = Command.extend({
       description: 'Possible values are "development", "production", and "test".',
     },
     { name: 'config-file', type: String, aliases: ['c', 'cf'] },
-    { name: 'server', type: Boolean, default: false, aliases: ['s'] },
     { name: 'host', type: String, aliases: ['H'] },
     {
       name: 'test-port',
@@ -77,12 +81,15 @@ module.exports = Command.extend({
     { name: 'test-page', type: String, description: 'Test page to invoke' },
     { name: 'path', type: 'Path', description: 'Reuse an existing build at given path.' },
     { name: 'query', type: String, description: 'A query string to append to the test page URL.' },
-    { name: 'output-path', type: 'Path', aliases: ['o'] },
   ],
 
   init() {
     this._super.apply(this, arguments);
 
+    if (!this.isViteProject) {
+      this.availableOptions = this.availableOptions.concat(ClassicOptions);
+    }
+
     // Make sure Testem supports the Wasm MIME type:
     require('express').static.mime.define({ 'application/wasm': ['wasm'] });
 
@@ -162,6 +169,22 @@ module.exports = Command.extend({
   },
 
   async run(commandOptions) {
+    if (this.isViteProject) {
+      if (commandOptions.outputPath) {
+        return Promise.reject(
+          new SilentError('The `--output-path` option to `ember test` is not supported in Vite-based projects.')
+        );
+      }
+
+      if (commandOptions.server) {
+        return Promise.reject(
+          new SilentError(
+            'The `--server` option to `ember test` is not supported in Vite-based projects. Please use the `start` script from package.json and visit `/tests` in the browser.'
+          )
+        );
+      }
+    }
+
     let hasBuild = !!commandOptions.path;
     let outputPath;
 

package/lib/models/command.js

@@ -89,6 +89,13 @@ let Command = CoreObject.extend({
      */
     this.isWithinProject = this.project.isEmberCLIProject();
 
+    /**
+     * @final
+     * @property isViteProject
+     * @type Boolean
+     */
+    this.isViteProject = this.isWithinProject && this.project.isViteProject?.();
+
     /**
      * The name of the command.
      *

package/lib/models/project.js

@@ -140,6 +140,10 @@ class Project {
       return false;
     };
 
+    NULL_PROJECT.isViteProject = function () {
+      return false;
+    };
+
     NULL_PROJECT.isEmberCLIAddon = function () {
       return false;
     };
@@ -168,7 +172,7 @@ class Project {
 
   /**
     Returns whether or not this is an Ember CLI project.
-    This checks whether ember-cli is listed in devDependencies.
+    This checks whether ember-cli is listed in (dev)Dependencies.
 
     @private
     @method isEmberCLIProject
@@ -178,6 +182,18 @@ class Project {
     return (this.cli ? this.cli.npmPackage : 'ember-cli') in this.dependencies();
   }
 
+  /**
+   Returns whether this is a Vite-based project.
+   This checks whether @embroider/vite is listed in (dev)Dependencies.
+
+   @private
+   @method isViteProject
+   @return {Boolean} Whether this is a Vite project
+   */
+  isViteProject() {
+    return '@embroider/vite' in this.dependencies(); // This would preferably be `isClassicProject` as Vite is the default now, but it is tough to come up with a metric
+  }
+
   /**
     Returns whether or not this is an Ember CLI addon.
 

package/lib/tasks/install-blueprint.js

@@ -13,6 +13,7 @@ const npa = require('npm-package-arg');
 const lintFix = require('../utilities/lint-fix');
 
 const logger = require('heimdalljs-logger')('ember-cli:tasks:install-blueprint');
+const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilities/experiments');
 
 const NOT_FOUND_REGEXP = /npm ERR! 404 {2}'(\S+)' is not in the npm registry/;
 
@@ -61,6 +62,10 @@ class InstallBlueprintTask extends Task {
     name = name || 'app';
     logger.info(`Resolving blueprint "${name}" ...`);
 
+    if (isExperimentEnabled('VITE') && name === 'app') {
+      return Blueprint.load(path.dirname(require.resolve('@ember/app-blueprint')));
+    }
+
     let blueprint;
     try {
       blueprint = await this._lookupLocalBlueprint(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.9.0-alpha.1",
+  "version": "6.9.0-alpha.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -35,7 +35,7 @@
     "publishTag": "alpha"
   },
   "dependencies": {
-    "@ember/app-blueprint": "6.9.0-alpha.1",
+    "@ember/app-blueprint": "~6.9.0-alpha.1",
     "@pnpm/find-workspace-dir": "^1000.1.0",
     "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
@@ -118,10 +118,10 @@
     "watch-detector": "^1.0.2",
     "workerpool": "^9.2.0",
     "yam": "^1.0.0",
-    "@ember-tooling/blueprint-blueprint": "0.2.0",
-    "@ember-tooling/blueprint-model": "0.4.0",
-    "@ember-tooling/classic-build-addon-blueprint": "6.9.0-alpha.1",
-    "@ember-tooling/classic-build-app-blueprint": "6.9.0-alpha.1"
+    "@ember-tooling/blueprint-blueprint": "0.2.1",
+    "@ember-tooling/classic-build-addon-blueprint": "6.9.0-alpha.2",
+    "@ember-tooling/blueprint-model": "0.4.1",
+    "@ember-tooling/classic-build-app-blueprint": "6.9.0-alpha.2"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.3",

package/packages/addon-blueprint/index.js

@@ -134,7 +134,7 @@ module.exports = {
    *     _ts_eslint.config.mjs is renamed to eslint.config.mjs
    */
   buildFileInfo(intoDir, templateVariables, file, commandOptions) {
-    if (file.startsWith('_js_') || file.startsWith('_ts_')) {
+    if (file.includes('_js_') || file.includes('_ts_')) {
       let fileInfo = this._super.buildFileInfo.apply(this, arguments);
 
       if (file.includes('_js_')) {

package/packages/addon-blueprint/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.9.0-alpha.1",
+  "version": "6.9.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/addon-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ],

package/packages/app-blueprint/files/.ember-cli

@@ -7,13 +7,13 @@
 
   /**
     Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
-    or GTS files for the component and the component rendering test. "loose" is the default.
+    or GTS files for the component and the component rendering test. "strict" is the default.
   */
   "componentAuthoringFormat": <%= strict ? '"strict"' : '"loose"' %>,
 
   /**
     Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
-    or GTS templates for routes. "loose" is the default
+    or GTS templates for routes. "strict" is the default
   */
   "routeAuthoringFormat": <%= strict ? '"strict"' : '"loose"' %>
 }

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

@@ -60,7 +60,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
     "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.9.0-alpha.1",
+    "ember-cli": "~6.9.0-alpha.2",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",

package/packages/app-blueprint/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.9.0-alpha.1",
+  "version": "6.9.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/app-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ],

package/packages/blueprint-blueprint/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@ember-tooling/blueprint-blueprint",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/blueprint-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ]

package/packages/blueprint-model/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@ember-tooling/blueprint-model",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/blueprint-model"
   },
+  "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.2",
     "diff": "^7.0.0",