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

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-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -31,11 +31,13 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   },
   "dependencies": {
-    "@ember/app-blueprint": "6.9.0-alpha.1",
+    "@ember-tooling/blueprint-blueprint": "^0.2.1",
+    "@ember-tooling/blueprint-model": "^0.4.1",
+    "@ember/app-blueprint": "~6.9.0-beta.1",
     "@pnpm/find-workspace-dir": "^1000.1.0",
     "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
@@ -118,10 +120,8 @@
     "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/classic-build-addon-blueprint": "6.9.0-beta.1",
+    "@ember-tooling/classic-build-app-blueprint": "6.9.0-beta.1"
   },
   "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,16 +1,17 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.9.0-alpha.1",
+  "version": "6.9.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/addon-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "workspace:*",
+    "@ember-tooling/blueprint-model": "^0.4.1",
     "chalk": "^4.1.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -25,7 +26,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }

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

@@ -45,22 +45,22 @@
     "@ember/test-helpers": "^5.3.0<% if (embroider) { %>",
     "@embroider/compat": "^3.9.1",
     "@embroider/core": "^3.5.7<% } %>",
-    "@embroider/macros": "^1.18.1<% if (embroider) { %>",
+    "@embroider/macros": "^1.19.1<% if (embroider) { %>",
     "@embroider/webpack": "^4.1.1<% } %>",
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^9.37.0",
     "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.5.2",
+    "@glint/template": "^1.6.1",
     "@tsconfig/ember": "^3.0.11",
     "@types/qunit": "^2.19.13",
     "@types/rsvp": "^4.0.9<% if (emberData) {%>",
     "@warp-drive/core-types": "~5.7.0<% }} %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
-    "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.9.0-alpha.1",
+    "ember-auto-import": "^2.11.1",
+    "ember-cli": "~6.9.0-beta.1",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",
@@ -76,27 +76,27 @@
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.9.0-alpha.1",
+    "ember-source": "~6.9.0-beta.1",
     "ember-template-imports": "^4.3.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.35.0",
+    "eslint": "^9.37.0",
     "eslint-config-prettier": "^9.1.2",
     "eslint-plugin-ember": "^12.7.4",
-    "eslint-plugin-n": "^17.23.0",
+    "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-qunit": "^8.2.5",
     "globals": "^15.15.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.6.2",
     "prettier-plugin-ember-template-tag": "^2.1.0",
-    "qunit": "^2.24.1",
+    "qunit": "^2.24.2",
     "qunit-dom": "^3.5.0",
-    "stylelint": "^16.24.0",
+    "stylelint": "^16.25.0",
     "stylelint-config-standard": "^36.0.1",
     "tracked-built-ins": "^3.4.0<% if (typescript) { %>",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.44.0<% } %>",
-    "webpack": "^5.101.3"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.1<% } %>",
+    "webpack": "^5.102.1"
   },
   "engines": {
     "node": ">= 20.11"

package/packages/app-blueprint/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.9.0-alpha.1",
+  "version": "6.9.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/app-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "workspace:*",
+    "@ember-tooling/blueprint-model": "^0.4.1",
     "chalk": "^4.1.2",
     "ember-cli-string-utils": "^1.1.0"
   },
@@ -19,7 +20,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }

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

@@ -1,16 +0,0 @@
-'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

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

package/packages/blueprint-blueprint/package.json

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

package/packages/blueprint-model/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@ember-tooling/blueprint-model",
-  "version": "0.4.0",
-  "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

@@ -1,31 +0,0 @@
-'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

@@ -1,64 +0,0 @@
-'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

@@ -1,63 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-
-/*
-  If you're here to remove the VITE experiment flag in favor of it being
-  permanently on, you can't do that until addressing
-  https://github.com/ember-cli/ember-cli/pull/10781#pullrequestreview-3230644293
-
-  A lot of test coverage would otherwise be lost, because valid tests are being
-  run only when the VITE experiment is off.
-*/
-const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC', 'VITE']);
-
-const deprecatedExperiments = Object.freeze([]);
-const enabledExperiments = Object.freeze(['VITE']);
-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,
-};