ember-cli 6.9.1 → 6.10.0-beta.1

package/lib/models/blueprint.js

@@ -4,15 +4,15 @@
 @module ember-cli
 */
 const FileInfo = require('@ember-tooling/blueprint-model/utilities/file-info');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const MarkdownColor = require('../utilities/markdown-color');
 const sequence = require('../utilities/sequence');
 const printCommand = require('../utilities/print-command');
 const insertIntoFile = require('../utilities/insert-into-file');
 const cleanRemove = require('../utilities/clean-remove');
 const fs = require('fs-extra');
-const inflector = require('inflection');
-const minimatch = require('minimatch');
+const { pluralize } = require('inflection');
+const { minimatch } = require('minimatch');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
 const merge = require('lodash/merge');
@@ -547,7 +547,7 @@ let Blueprint = CoreObject.extend({
       let strippedCode = code;
       for (let i = 0; i < templateTagMatches.length; i++) {
         const match = templateTagMatches[i];
-        const templateTag = substringBytes(code, match.range.start, match.range.end);
+        const templateTag = substringBytes(code, match.range.startByte, match.range.endByte);
         if (match.type === 'class-member') {
           strippedCode = strippedCode.replace(templateTag, replacementClassMember(i));
         } else {
@@ -562,7 +562,7 @@ let Blueprint = CoreObject.extend({
       let transformedWithTemplateTag = transformed;
       for (let i = 0; i < templateTagMatches.length; i++) {
         const match = templateTagMatches[i];
-        const templateTag = substringBytes(code, match.range.start, match.range.end);
+        const templateTag = substringBytes(code, match.range.startByte, match.range.endByte);
         if (match.type === 'class-member') {
           transformedWithTemplateTag = transformedWithTemplateTag.replace(replacementClassMember(i), templateTag);
         } else {
@@ -745,7 +745,7 @@ let Blueprint = CoreObject.extend({
         if (options.pod && options.hasPathToken) {
           return path.join(options.podPath, options.dasherizedModuleName);
         }
-        return inflector.pluralize(blueprintName);
+        return pluralize(blueprintName);
       },
       __root__(options) {
         if (options.inRepoAddon) {

package/lib/models/builder.js

@@ -4,7 +4,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const CoreObject = require('core-object');
 const SilentError = require('silent-error');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const findBuildFile = require('../utilities/find-build-file');
 const _resetTreeCache = require('./addon')._resetTreeCache;
 const Sync = require('tree-sync');

package/lib/models/command.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const nopt = require('nopt');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const path = require('path');
 const isGitRepo = require('is-git-url');
 const camelize = require('ember-cli-string-utils').camelize;

package/lib/models/hardware-info.js

@@ -1,10 +1,13 @@
 'use strict';
 
-const execa = require('execa');
+const { execaSync } = require('execa');
 const fs = require('fs');
 const logger = require('heimdalljs-logger')('ember-cli:hardware-info');
 const os = require('os');
 
+// For testing purposes:
+const execa = { sync: execaSync };
+
 function isUsingBatteryAcpi() {
   try {
     const { stdout } = execa.sync('acpi', ['--ac-adapter']);
@@ -382,4 +385,4 @@ const hwinfo = {
   },
 };
 
-module.exports = hwinfo;
+module.exports = { execa, hwinfo };

package/lib/models/instrumentation.js

@@ -1,12 +1,12 @@
 'use strict';
 
 const fs = require('fs-extra');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const heimdallGraph = require('heimdalljs-graph');
 const getConfig = require('../utilities/get-config');
 const utilsInstrumentation = require('../utilities/instrumentation');
 const logger = require('heimdalljs-logger')('ember-cli:instrumentation');
-const hwinfo = require('./hardware-info');
+const { hwinfo } = require('./hardware-info');
 
 let vizEnabled = utilsInstrumentation.vizEnabled;
 let instrumentationEnabled = utilsInstrumentation.instrumentationEnabled;

package/lib/models/project.js

@@ -5,7 +5,7 @@
 */
 const util = require('util');
 const path = require('path');
-const findup = require('find-up');
+const { findUpSync } = require('find-up');
 const resolve = util.promisify(require('resolve'));
 const fs = require('fs-extra');
 const cloneDeep = require('lodash/cloneDeep');
@@ -717,7 +717,7 @@ class Project {
     @return {String} The project root directory
    */
   static getProjectRoot() {
-    let packagePath = findup.sync('package.json');
+    let packagePath = findUpSync('package.json');
     if (!packagePath) {
       logger.info('getProjectRoot: not found. Will use cwd: %s', process.cwd());
       return process.cwd();
@@ -777,7 +777,7 @@ function ensureUI(_ui) {
 }
 
 function findupPath(pathName) {
-  let pkgPath = findup.sync('package.json', { cwd: pathName });
+  let pkgPath = findUpSync('package.json', { cwd: pathName });
   if (!pkgPath) {
     throw new NotFoundError(`No project found at or up from: \`${pathName}\``);
   }

package/lib/models/watcher.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const logger = require('heimdalljs-logger')('ember-cli:watcher');
 const CoreObject = require('core-object');
 const serveURL = require('../utilities/get-serve-url');

package/lib/models/worker.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const workerpool = require('workerpool');
+const { worker } = require('workerpool');
 const gzipStats = require('./gzipStats');
 
 // create worker and register public functions
-workerpool.worker({
+worker({
   gzipStats,
 });

package/lib/tasks/addon-install.js

@@ -14,7 +14,7 @@ class AddonInstallTask extends Task {
   }
 
   run(options) {
-    const chalk = require('chalk');
+    const { default: chalk } = require('chalk');
     let ui = this.ui;
     let packageNames = options.packages || [];
     let blueprintOptions = options.blueprintOptions || {};

package/lib/tasks/build-watch.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const path = require('path');
 const Task = require('../models/task');
 const Watcher = require('../models/watcher');
 const Builder = require('../models/builder');
-const pDefer = require('p-defer');
+const { default: pDefer } = require('p-defer');
 
 class BuildWatchTask extends Task {
   constructor(options) {

package/lib/tasks/build.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const Task = require('../models/task');
 const Builder = require('../models/builder');
 

package/lib/tasks/git-init.js

@@ -4,12 +4,12 @@ const Task = require('../models/task');
 const path = require('path');
 const pkg = require('../../package.json');
 const fs = require('fs');
-const execa = require('../utilities/execa');
+const { execa } = require('execa');
 
 module.exports = class GitInitTask extends Task {
   async run(_commandOptions) {
     let commandOptions = _commandOptions || {};
-    const chalk = require('chalk');
+    const { default: chalk } = require('chalk');
     let ui = this.ui;
 
     if (commandOptions.skipGit) {

package/lib/tasks/install-blueprint.js

@@ -7,7 +7,7 @@ const util = require('util');
 const temp = require('temp');
 const path = require('path');
 const merge = require('lodash/merge');
-const execa = require('../utilities/execa');
+const { execa } = require('execa');
 const SilentError = require('silent-error');
 const npa = require('npm-package-arg');
 const lintFix = require('../utilities/lint-fix');

package/lib/tasks/interactive-new.js

@@ -27,7 +27,7 @@ class InteractiveNewTask extends Task {
     return [
       {
         name: 'blueprint',
-        type: 'list',
+        type: 'select',
         message: 'Is this an app or an addon?',
         choices: [
           {
@@ -59,7 +59,7 @@ class InteractiveNewTask extends Task {
       },
       {
         name: 'langSelection',
-        type: 'list',
+        type: 'select',
         message: ({ blueprint }) => `Please provide the spoken/content language of your ${blueprint}:`,
         when: !newCommandOptions.lang,
         choices: await this.getLangChoices(),
@@ -79,7 +79,7 @@ class InteractiveNewTask extends Task {
       },
       {
         name: 'packageManager',
-        type: 'list',
+        type: 'select',
         message: 'Pick the package manager to use when installing dependencies:',
         when: !newCommandOptions.packageManager,
         choices: [
@@ -103,7 +103,7 @@ class InteractiveNewTask extends Task {
       },
       {
         name: 'ciProvider',
-        type: 'list',
+        type: 'select',
         message: 'Which CI provider do you want to use?',
         when: !newCommandOptions.ciProvider,
         choices: [
@@ -165,7 +165,7 @@ class InteractiveNewTask extends Task {
   }
 
   getUserLocale() {
-    const osLocale = require('os-locale');
+    const { osLocale } = require('os-locale');
 
     return osLocale();
   }

package/lib/tasks/npm-task.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const chalk = require('chalk');
-const execa = require('../utilities/execa');
+const { default: chalk } = require('chalk');
+const { execa } = require('execa');
 const semver = require('semver');
 const SilentError = require('silent-error');
 const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');

package/lib/tasks/serve.js

@@ -9,7 +9,7 @@ const ServerWatcher = require('../models/server-watcher');
 const Builder = require('../models/builder');
 const SilentError = require('silent-error');
 const serveURL = require('../utilities/get-serve-url');
-const pDefer = require('p-defer');
+const { default: pDefer } = require('p-defer');
 
 function mockWatcher(distDir) {
   let watcher = Promise.resolve({ directory: distDir });

package/lib/tasks/server/express-server.js

@@ -2,7 +2,7 @@
 
 const path = require('path');
 const EventEmitter = require('events').EventEmitter;
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const fs = require('fs');
 const debounce = require('lodash/debounce');
 const mapSeries = require('promise-map-series');

package/lib/tasks/test-server.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const TestTask = require('./test');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const SilentError = require('silent-error');
 
 class TestServerTask extends TestTask {

package/lib/utilities/find-build-file.js

@@ -1,5 +1,5 @@
 'use strict';
-const findUp = require('find-up');
+const { findUpSync } = require('find-up');
 const path = require('path');
 const url = require('url');
 
@@ -7,7 +7,7 @@ module.exports = async function (dir) {
   let buildFilePath = null;
 
   for (let ext of ['js', 'mjs', 'cjs']) {
-    let candidate = findUp.sync(`ember-cli-build.${ext}`, { cwd: dir });
+    let candidate = findUpSync(`ember-cli-build.${ext}`, { cwd: dir });
     if (candidate) {
       buildFilePath = candidate;
       break;

package/lib/utilities/get-lang-arg.js

@@ -236,10 +236,10 @@ function getBodyMsg(langArg) {
   return isValidCodeAndProg(langArg)
     ? getValidAndProgMsg(langArg)
     : isProgLang(langArg)
-    ? getProgLangMsg(langArg)
-    : startsWithHyphen(langArg)
-    ? getCliMsg(langArg)
-    : getLangCodeMsg(langArg);
+      ? getProgLangMsg(langArg)
+      : startsWithHyphen(langArg)
+        ? getCliMsg(langArg)
+        : getLangCodeMsg(langArg);
 }
 
 function getFullMsg(langArg) {

package/lib/utilities/heimdall-progress.js

@@ -1,10 +1,13 @@
 'use strict';
 
+const { default: chalk } = require('chalk');
+
 module.exports = function progress(heimdalljs = require('heimdalljs')) {
   let current = heimdalljs.current;
   const stack = [current.id.name];
 
-  while (current = current.parent) { // eslint-disable-line
+  while ((current = current.parent)) {
+    // eslint-disable-line
     stack.push(current.id.name);
   }
 
@@ -15,5 +18,5 @@ module.exports = function progress(heimdalljs = require('heimdalljs')) {
 };
 
 module.exports.format = function (text) {
-  return require('chalk').green('building... ') + (text ? `[${text}]` : '');
+  return chalk.green('building... ') + (text ? `[${text}]` : '');
 };

package/lib/utilities/lint-fix.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const execa = require('../utilities/execa');
+const { execa } = require('execa');
 const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
 

package/lib/utilities/markdown-color.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const SilentError = require('silent-error');
 const merge = require('lodash/merge');
 

package/lib/utilities/print-command.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const EOL = require('os').EOL;
 
 module.exports = function (initialMargin, shouldDescriptionBeGrey) {

package/lib/utilities/require-as-hash.js

@@ -13,18 +13,20 @@ const stringUtils = require('ember-cli-string-utils');
 //   Hamster: Hamster // Same as require('./hamster.js')
 // }
 
-const globSync = require('glob').sync;
+const { globSync } = require('glob');
 const path = require('path');
 const getCallerFile = require('get-caller-file');
 
 module.exports = requireAsHash;
 function requireAsHash(pattern, type) {
   let callerFileDir = path.dirname(getCallerFile());
-  return globSync(pattern, { cwd: callerFileDir }).reduce((hash, file) => {
-    const klass = require(`${callerFileDir}/${file}`);
-    if (!type || klass.prototype instanceof type) {
-      hash[stringUtils.classify(path.basename(file, '.js'))] = klass;
-    }
-    return hash;
-  }, {});
+  return globSync(pattern, { cwd: callerFileDir })
+    .sort()
+    .reduce((hash, file) => {
+      const klass = require(`${callerFileDir}/${file}`);
+      if (!type || klass.prototype instanceof type) {
+        hash[stringUtils.classify(path.basename(file, '.js'))] = klass;
+      }
+      return hash;
+    }, {});
 }

package/lib/utilities/windows-admin.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 
 class WindowsSymlinkChecker {
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.9.1",
+  "version": "6.10.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -26,12 +26,20 @@
   "bin": {
     "ember": "./bin/ember"
   },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
+  },
   "dependencies": {
     "@ember-tooling/blueprint-blueprint": "^0.2.1",
-    "@ember-tooling/blueprint-model": "^0.4.1",
-    "@ember/app-blueprint": "~6.9.0",
-    "@pnpm/find-workspace-dir": "^1000.1.0",
-    "babel-remove-types": "^1.0.1",
+    "@ember-tooling/blueprint-model": "^0.5.0",
+    "@ember/app-blueprint": "~6.10.0-beta.1",
+    "@pnpm/find-workspace-dir": "^1000.1.3",
+    "babel-remove-types": "^1.0.2",
     "broccoli": "^4.0.0",
     "broccoli-concat": "^4.2.5",
     "broccoli-config-loader": "^1.0.1",
@@ -46,105 +54,105 @@
     "broccoli-stew": "^3.0.0",
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
-    "chalk": "^4.1.2",
-    "ci-info": "^4.0.0",
+    "chalk": "^5.6.2",
+    "ci-info": "^4.3.1",
     "clean-base-url": "^1.0.0",
-    "compression": "^1.8.0",
-    "configstore": "^5.0.1",
+    "compression": "^1.8.1",
+    "configstore": "^7.1.0",
     "console-ui": "^3.1.2",
-    "content-tag": "^3.1.2",
+    "content-tag": "^4.0.0",
     "core-object": "^3.1.5",
     "dag-map": "^2.0.2",
-    "diff": "^7.0.0",
+    "diff": "^8.0.2",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^5.0.1",
     "ember-cli-string-utils": "^1.1.0",
     "ensure-posix-path": "^1.1.1",
-    "execa": "^5.1.1",
+    "execa": "^9.6.1",
     "exit": "^0.1.2",
-    "express": "^4.21.1",
-    "filesize": "^10.0.8",
-    "find-up": "^5.0.0",
+    "express": "^5.2.1",
+    "filesize": "^11.0.13",
+    "find-up": "^8.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
-    "fs-extra": "^11.3.0",
+    "fs-extra": "^11.3.3",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
-    "glob": "^8.1.0",
+    "glob": "^13.0.0",
     "heimdalljs": "^0.2.6",
     "heimdalljs-fs-monitor": "^1.1.2",
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
-    "inflection": "^2.0.1",
-    "inquirer": "^9.1.5",
+    "inflection": "^3.0.2",
+    "inquirer": "^13.1.0",
     "is-git-url": "^1.0.0",
-    "is-language-code": "^3.1.0",
-    "isbinaryfile": "^5.0.4",
+    "is-language-code": "^5.1.0",
+    "isbinaryfile": "^6.0.0",
     "lodash": "^4.17.21",
     "markdown-it": "^14.1.0",
     "markdown-it-terminal": "^0.4.0",
-    "minimatch": "^7.4.3",
-    "morgan": "^1.10.0",
+    "minimatch": "^10.1.1",
+    "morgan": "^1.10.1",
     "nopt": "^3.0.6",
-    "npm-package-arg": "^12.0.2",
-    "os-locale": "^5.0.0",
-    "p-defer": "^3.0.0",
+    "npm-package-arg": "^13.0.2",
+    "os-locale": "^6.0.2",
+    "p-defer": "^4.0.1",
     "portfinder": "^1.0.32",
     "promise-map-series": "^0.3.0",
     "promise.hash.helper": "^1.0.8",
-    "quick-temp": "^0.1.8",
-    "resolve": "^1.22.10",
+    "quick-temp": "^0.1.9",
+    "resolve": "^1.22.11",
     "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.4.3",
     "sane": "^5.0.1",
-    "semver": "^7.7.1",
+    "semver": "^7.7.3",
     "silent-error": "^1.1.1",
-    "sort-package-json": "^2.12.0",
+    "sort-package-json": "^3.6.0",
     "symlink-or-copy": "^1.3.1",
     "temp": "0.9.4",
-    "testem": "^3.15.2",
+    "testem": "^3.17.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
-    "walk-sync": "^3.0.0",
+    "walk-sync": "^4.0.1",
     "watch-detector": "^1.0.2",
-    "workerpool": "^9.2.0",
+    "workerpool": "^10.0.1",
     "yam": "^1.0.0",
-    "@ember-tooling/classic-build-addon-blueprint": "6.9.0",
-    "@ember-tooling/classic-build-app-blueprint": "6.9.0"
+    "@ember-tooling/classic-build-addon-blueprint": "6.10.0-beta.1",
+    "@ember-tooling/classic-build-app-blueprint": "6.10.0-beta.1"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
-    "chai": "^4.3.7",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^6.2.1",
+    "chai-as-promised": "^8.0.2",
     "chai-files": "^1.4.0",
     "chai-jest-snapshot": "^2.0.0",
+    "concurrently": "^9.2.1",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
     "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.9.0",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^10.5.0",
-    "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-n": "^17.23.1",
     "fixturify": "^3.0.0",
     "jsdom": "^21.1.1",
-    "latest-version": "^5.1.0",
-    "mocha": "^11.1.0",
-    "nock": "^13.5.5",
-    "nyc": "^15.1.0",
-    "prettier": "2.8.7",
+    "latest-version": "^9.0.0",
+    "mocha": "^11.7.5",
+    "nock": "^14.0.10",
+    "nyc": "^17.1.0",
+    "prettier": "3.7.4",
     "release-plan": "^0.17.2",
-    "strip-ansi": "^6.0.0",
-    "supertest": "^7.1.0",
+    "strip-ansi": "^7.1.2",
+    "supertest": "^7.1.4",
     "testdouble": "^3.18.0",
-    "tmp": "^0.2.1",
+    "tmp": "^0.2.5",
     "tmp-promise": "^3.0.3",
     "websocket": "^1.0.32",
-    "which": "3.0.1",
+    "which": "6.0.0",
     "yuidoc-ember-cli-theme": "^1.0.4",
     "yuidocjs": "0.10.2"
   },
@@ -160,7 +168,12 @@
   },
   "scripts": {
     "docs": "yuidoc",
-    "lint": "eslint . --cache",
+    "format": "prettier . --cache --write",
+    "lint": "concurrently \"pnpm:lint:*(!fix)\" --group --names \"lint:\" --prefixColors auto --timings",
+    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --group --names \"fix:\" --prefixColors auto --timings && pnpm format",
+    "lint:format": "prettier . --cache --check",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
     "mocha": "pnpm exec mocha --require ./tests/bootstrap.js tests/**/*-test.js",
     "test": "node --unhandled-rejections=strict tests/runner",
     "test:all": "node --unhandled-rejections=strict tests/runner all",

package/packages/addon-blueprint/additional-package.json

@@ -1,7 +1,5 @@
 {
-  "keywords": [
-    "ember-addon"
-  ],
+  "keywords": ["ember-addon"],
   "scripts": {
     "test:ember-compatibility": "ember try:each"
   },

package/packages/addon-blueprint/index.js

@@ -3,7 +3,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const walkSync = require('walk-sync');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const merge = require('lodash/merge');
 const uniq = require('lodash/uniq');