ember-cli 6.10.0-alpha.1 → 6.11.0-alpha.1

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

@@ -45,9 +45,9 @@
     "@ember/test-helpers": "^5.4.1<% if (embroider) { %>",
     "@embroider/compat": "^3.9.3",
     "@embroider/core": "^3.5.9<% } %>",
-    "@embroider/macros": "^1.19.5<% if (embroider) { %>",
+    "@embroider/macros": "^1.19.6<% if (embroider) { %>",
     "@embroider/webpack": "^4.1.2<% } %>",
-    "@eslint/js": "^9.39.1",
+    "@eslint/js": "^9.39.2",
     "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.5.2",
@@ -60,7 +60,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
     "ember-auto-import": "^2.12.0",
-    "ember-cli": "~6.10.0-alpha.1",
+    "ember-cli": "~6.11.0-alpha.1",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",
@@ -76,11 +76,11 @@
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.10.0-alpha.1",
-    "ember-template-imports": "^4.3.0",
+    "ember-source": "~6.11.0-alpha.6",
+    "ember-template-imports": "^4.4.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^9.1.2",
     "eslint-plugin-ember": "^12.7.5",
     "eslint-plugin-n": "^17.23.1",
@@ -89,14 +89,14 @@
     "loader.js": "^4.7.0",
     "prettier": "^3.7.4",
     "prettier-plugin-ember-template-tag": "^2.1.2",
-    "qunit": "^2.24.3",
+    "qunit": "^2.25.0",
     "qunit-dom": "^3.5.0",
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^36.0.1",
     "tracked-built-ins": "^3.4.0<% if (typescript) { %>",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.49.0<% } %>",
-    "webpack": "^5.103.0"
+    "typescript-eslint": "^8.52.0<% } %>",
+    "webpack": "^5.104.1"
   },
   "engines": {
     "node": ">= 20.19"

package/packages/app-blueprint/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const stringUtil = require('ember-cli-string-utils');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilities/experiments');
 const directoryForPackageName = require('@ember-tooling/blueprint-model/utilities/directory-for-package-name');
 const blueprintVersion = require('./package.json').version;

package/packages/app-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.10.0-alpha.1",
+  "version": "6.11.0-alpha.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "@ember-tooling/blueprint-model": "workspace:*",
-    "chalk": "^4.1.2",
+    "chalk": "^5.6.2",
     "ember-cli-string-utils": "^1.1.0"
   },
   "release-plan": {

package/packages/blueprint-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/blueprint-model",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -8,7 +8,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "chalk": "^4.1.2",
+    "chalk": "^5.6.2",
     "diff": "^7.0.0",
     "isbinaryfile": "^5.0.4",
     "lodash": "^4.17.21",

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

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const util = require('util');
-const jsdiff = require('diff');
+const { applyPatch, createPatch } = require('diff');
 const quickTemp = require('quick-temp');
 const path = require('path');
 const SilentError = require('silent-error');
@@ -38,7 +38,7 @@ class EditFileDiff {
       diffString: readFile(resultHash.diffPath),
       currentString: readFile(resultHash.outputPath),
     }).then((result) => {
-      let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString());
+      let appliedDiff = applyPatch(result.currentString.toString(), result.diffString.toString());
 
       if (!appliedDiff) {
         let message = 'Patch was not cleanly applied.';
@@ -52,7 +52,7 @@ class EditFileDiff {
 
   invokeEditor(result) {
     let info = this.info;
-    let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input);
+    let diff = createPatch(info.outputPath, result.output.toString(), result.input);
     let diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff');
 
     return writeFile(diffPath, diff)

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 
 /*
   If you're here to remove the VITE experiment flag in favor of it being

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

@@ -2,11 +2,11 @@
 
 const fs = require('fs');
 const util = require('util');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const EditFileDiff = require('./edit-file-diff');
 const EOL = require('os').EOL;
 const rxEOL = new RegExp(EOL, 'g');
-const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
+const { isBinaryFileSync } = require('isbinaryfile');
 const hash = require('promise.hash.helper');
 const canEdit = require('./open-editor').canEdit;
 const processTemplate = require('./process-template');
@@ -58,7 +58,7 @@ class FileInfo {
       /* ignore */
     }
 
-    let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
+    let canDiff = !isBinaryFileSync(this.inputPath) && (!outputPathIsFile || !isBinaryFileSync(this.outputPath));
 
     if (canDiff) {
       promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
@@ -73,12 +73,12 @@ class FileInfo {
 
   displayDiff() {
     let info = this,
-      jsdiff = require('diff');
+      { createPatch } = require('diff');
     return hash({
       input: this.render(),
       output: readFile(info.outputPath),
     }).then((result) => {
-      let diff = jsdiff.createPatch(
+      let diff = createPatch(
         info.outputPath,
         result.output.toString().replace(rxEOL, '\n'),
         result.input.replace(rxEOL, '\n')
@@ -106,7 +106,7 @@ class FileInfo {
 
     return readFile(path).then((content) =>
       lstat(path).then((fileStat) => {
-        if (isBinaryFile(content, fileStat.size)) {
+        if (isBinaryFileSync(content, fileStat.size)) {
           return content;
         } else {
           try {

package/tests/helpers/acceptance.js

@@ -5,7 +5,7 @@ const path = require('path');
 const fs = require('fs-extra');
 // eslint-disable-next-line n/no-unpublished-require
 const tmp = require('tmp-promise');
-const execa = require('execa');
+const { execa } = require('execa');
 
 const runCommand = require('./run-command');
 const hasGlobalYarn = require('../helpers/has-global-yarn');

package/tests/helpers/command-generator.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const execa = require('../../lib/utilities/execa');
+const { execaSync } = require('execa');
 
 /**
  * A simple tool to make behavior and API consistent between commands
@@ -45,6 +45,6 @@ module.exports = class CommandGenerator {
   }
 
   _invoke(args, options) {
-    return execa.sync(this.program, args, options);
+    return execaSync(this.program, args, options);
   }
 };

package/tests/helpers/package-cache.js

@@ -3,7 +3,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const quickTemp = require('quick-temp');
-const Configstore = require('configstore');
+const { default: Configstore } = require('configstore');
 const CommandGenerator = require('./command-generator');
 const stableStringify = require('safe-stable-stringify');
 const symlinkOrCopySync = require('symlink-or-copy').sync;

package/tests/helpers/process-help-string.js

@@ -1,12 +1,12 @@
 'use strict';
 
-const chalk = require('chalk');
+const { supportsColor } = require('chalk');
 // eslint-disable-next-line n/no-unpublished-require
-const stripAnsi = require('strip-ansi');
+const { default: stripAnsi } = require('strip-ansi');
 
 module.exports = function (helpString) {
   // currently windows
-  if (chalk.supportsColor) {
+  if (supportsColor) {
     return helpString;
   }
   return stripAnsi(helpString);

package/tests/helpers/run-command.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const spawn = require('child_process').spawn;
 const defaults = require('lodash/defaults');
 const killCliProcess = require('./kill-cli-process');

package/lib/utilities/execa.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const execa = require('execa');
-const logger = require('heimdalljs-logger')('ember-cli:execa');
-
-async function _execa(cmd, args, opts) {
-  logger.info('execa(%j, %j)', cmd, args);
-  let result = await execa(cmd, args, opts);
-  logger.info('execa(%j, %j) -> code: %d', cmd, args, result.code);
-  return result;
-}
-
-_execa.sync = function (cmd, args, opts) {
-  logger.info('execa.sync(%j, %j)', cmd, args);
-  let result = execa.sync(cmd, args, opts);
-  logger.info('execa.sync(%j, %j) -> code: %d', cmd, args, result.code);
-  return result;
-};
-
-module.exports = _execa;