ember-cli 6.9.1 → 6.10.0-beta.1

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.9.0",
+  "version": "6.10.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,8 +11,8 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.4.1",
-    "chalk": "^4.1.2",
+    "@ember-tooling/blueprint-model": "^0.5.0",
+    "chalk": "^5.6.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
     "fs-extra": "^11.3.0",
@@ -20,5 +20,13 @@
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.12.0",
     "walk-sync": "^3.0.0"
+  },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }

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.9.1",
+    "ember-cli": "~6.10.0-beta.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.9.0",
-    "ember-template-imports": "^4.3.0",
+    "ember-source": "~6.10.0-beta.1",
+    "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,17 +89,17 @@
     "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.11"
+    "node": ">= 20.19"
   },
   "ember": {
     "edition": "octane"

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.9.0",
+  "version": "6.10.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,8 +11,16 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.4.1",
-    "chalk": "^4.1.2",
+    "@ember-tooling/blueprint-model": "^0.5.0",
+    "chalk": "^5.6.2",
     "ember-cli-string-utils": "^1.1.0"
+  },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }

package/tests/helpers/acceptance.js

@@ -3,6 +3,10 @@
 const symlinkOrCopySync = require('symlink-or-copy').sync;
 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 runCommand = require('./run-command');
 const hasGlobalYarn = require('../helpers/has-global-yarn');
 
@@ -59,6 +63,13 @@ function applyCommand(command, name /*, ...flags*/) {
  * @return {Promise}  The result of the running the command
  */
 function createTestTargets(projectName, options) {
+  console.warn(`**********************************************
+**  DO NOT USE createTestTargets ANY MORE!  **
+**********************************************
+
+Use createAndInstallTestTargets() which doesn't use a complicated packageCache system
+and relies on the pnpm store for caching instead.`);
+
   let outputDir = quickTemp.makeOrReuse(dirs, projectName);
 
   options = options || {};
@@ -115,7 +126,46 @@ function cleanupRun(projectName) {
   quickTemp.remove(dirs, `${projectName}-clone`);
 }
 
+/**
+ *
+ * @param {string} projectName
+ * @param {string} options.command defaults to new
+ * @returns {Promise<{ result: string, path: string, cleanup: () => void }>} an object containing command result, path, and a cleanup function;
+ */
+async function createAndInstallTestTargets(projectName, options) {
+  let outputDir = await tmp.dir({ unsafeCleanup: true });
+
+  let command = options?.command ?? 'new';
+
+  let result = await applyCommand(command, projectName, '--skip-npm', `--directory=${outputDir.path}`);
+
+  await execa('pnpm', ['install', '--prefer-offline'], {
+    preferLocal: true,
+    cwd: outputDir.path,
+  });
+
+  for (let pkg of [
+    '.',
+    'packages/blueprint-model',
+    'packages/blueprint-blueprint',
+    'packages/app-blueprint',
+    'packages/addon-blueprint',
+  ]) {
+    await execa('pnpm', ['link', path.join(__dirname, `../../${pkg}`)], {
+      preferLocal: true,
+      cwd: outputDir.path,
+    });
+  }
+
+  return {
+    result,
+    cleanup: outputDir.cleanup,
+    path: outputDir.path,
+  };
+}
+
 module.exports = {
+  createAndInstallTestTargets,
   createTestTargets,
   linkDependencies,
   teardownTestTargets,

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;