ember-cli 6.8.0-alpha.1 → 6.8.0-alpha.3

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # ember-cli Changelog
 
+## Release (2025-09-05)
+
+* @ember-tooling/classic-build-addon-blueprint 6.8.0-alpha.3 (patch)
+* @ember-tooling/classic-build-app-blueprint 6.8.0-alpha.3 (patch)
+* @ember-tooling/blueprint-model 0.1.0 (minor)
+* ember-cli 6.8.0-alpha.3 (patch)
+
+#### :rocket: Enhancement
+* `@ember-tooling/blueprint-model`
+  * [#10781](https://github.com/ember-cli/ember-cli/pull/10781) Add new `VITE` experiment to generate app with new Vite blueprint ([@pichfl](https://github.com/pichfl))
+
+#### Committers: 1
+- Florian Pichler ([@pichfl](https://github.com/pichfl))
+
+## Release (2025-09-01)
+
+* @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)

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,17 +38,21 @@ 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
 
-```
-node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=latest
-```
+  ```
+  node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=latest
+  ```
 
 - 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,17 +64,27 @@ 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
 
-```
-node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=beta
-```
+  ```
+  node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=beta
+  ```
 
 - commit this update `git commit -am "update blueprint dependencies to beta"`
-- push and open a PR targeting `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
 - merge the `merge-release` branch into `beta` in GitHub
@@ -79,17 +100,24 @@ 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
 
-```
-node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=canary
-```
+  ```
+  node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=canary
+  ```
 
 - commit this update `git commit -am "update blueprint dependencies to alpha"`
-- push and open a PR targeting `master`
+- **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
 - 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.8.0-alpha.1-master-4e559d67cd"
+        "version": "6.8.0-alpha.3-master-5b57bf781a"
     },
     "files": {
         "lib/broccoli/default-packager.js": {

package/lib/commands/init.js

@@ -10,6 +10,9 @@ 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');
+
+const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilities/experiments');
 
 module.exports = Command.extend({
   name: 'init',
@@ -39,7 +42,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 +82,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;
     }
@@ -104,15 +118,28 @@ 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 || '',
+      targetFiles: rawArgs || [],
       rawArgs: rawArgs.toString(),
-      blueprint: normalizeBlueprint(blueprintOpts.blueprint || this._defaultBlueprint()),
+      blueprint,
       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 +169,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.8.0-alpha.1",
+  "version": "6.8.0-alpha.3",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -35,6 +35,7 @@
     "publishTag": "alpha"
   },
   "dependencies": {
+    "@ember/app-blueprint": "^6.8.0-beta.1",
     "@pnpm/find-workspace-dir": "^1000.1.0",
     "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
@@ -79,7 +80,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",
@@ -117,13 +118,12 @@
     "watch-detector": "^1.0.2",
     "workerpool": "^9.2.0",
     "yam": "^1.0.0",
+    "@ember-tooling/blueprint-model": "0.1.0",
     "@ember-tooling/blueprint-blueprint": "0.0.2",
-    "@ember-tooling/classic-build-app-blueprint": "6.8.0-alpha.1",
-    "@ember-tooling/blueprint-model": "0.0.2",
-    "@ember-tooling/classic-build-addon-blueprint": "6.8.0-alpha.1"
+    "@ember-tooling/classic-build-addon-blueprint": "6.8.0-alpha.3",
+    "@ember-tooling/classic-build-app-blueprint": "6.8.0-alpha.3"
   },
   "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,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.8.0-alpha.1",
+  "version": "6.8.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",

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

@@ -60,7 +60,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.0",
     "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.8.0-alpha.1",
+    "ember-cli": "~6.8.0-alpha.3",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.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,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.8.0-alpha.1",
+  "version": "6.8.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",

package/packages/blueprint-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/blueprint-model",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",

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

@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC']);
+const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC', 'VITE']);
 
 const deprecatedExperiments = Object.freeze([]);
 const enabledExperiments = Object.freeze([]);