ember-cli 7.1.0-beta.1 → 7.2.0-alpha.1

package/lib/commands/generate.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const { default: chalk } = require('chalk');
 const Command = require('../models/command');
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const merge = require('lodash/merge');
 const reject = require('lodash/reject');

package/lib/models/command.js

@@ -6,7 +6,7 @@ const path = require('path');
 const isGitRepo = require('is-git-url');
 const camelize = require('ember-cli-string-utils').camelize;
 const getCallerFile = require('get-caller-file');
-const printCommand = require('../utilities/print-command');
+const printCommand = require('@ember-tooling/blueprint-model/utilities/print-command');
 const union = require('lodash/union');
 const defaults = require('lodash/defaults');
 const uniq = require('lodash/uniq');

package/lib/models/package-info-cache/package-info.js

@@ -4,7 +4,7 @@ const path = require('path');
 const ErrorList = require('./error-list');
 const Errors = require('./errors');
 const AddonInfo = require('../addon-info');
-const isAddon = require('../../utilities/is-addon');
+const isAddon = require('@ember-tooling/blueprint-model/utilities/is-addon');
 const isEngine = require('../../utilities/is-engine');
 const isLazyEngine = require('../../utilities/is-lazy-engine');
 const logger = require('heimdalljs-logger')('ember-cli:package-info-cache:package-info');

package/lib/tasks/generate-from-blueprint.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 const Task = require('../models/task');
 const parseOptions = require('../utilities/parse-options');
 const logger = require('heimdalljs-logger')('ember-cli:generate-from-blueprint');

package/lib/tasks/install-blueprint.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs-extra');
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 const Task = require('../models/task');
 const os = require('os');
 const path = require('path');
@@ -186,7 +186,9 @@ class InstallBlueprintTask extends Task {
     logger.info(`Checking for "ember-blueprint" keyword in "${packageName}" module ...`);
     let pkg = require(this._resolvePackageJSON(modulePath));
     if (!pkg || !pkg.keywords || pkg.keywords.indexOf('ember-blueprint') === -1) {
-      throw new SilentError(`The package '${packageName}' is not a valid Ember CLI blueprint.`);
+      throw new SilentError(
+        `The package '${packageName}' is not a valid Ember CLI blueprint. The package.json keywords list must include "ember-blueprint".`
+      );
     }
   }
 

package/lib/utilities/merge-blueprint-options.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const SilentError = require('silent-error');
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 
 /*
  * Helper for commands that use a blueprint to merge the blueprint's options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "7.1.0-beta.1",
+  "version": "7.2.0-alpha.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -31,13 +31,11 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   },
   "dependencies": {
-    "@ember-tooling/blueprint-blueprint": "^0.3.0",
-    "@ember-tooling/blueprint-model": "^0.6.3",
-    "@ember/app-blueprint": "~7.1.0-beta.1",
+    "@ember/app-blueprint": "~7.2.0-alpha.1",
     "@pnpm/find-workspace-dir": "^1000.1.5",
     "babel-remove-types": "^2.0.0",
     "broccoli": "^4.0.0",
@@ -106,7 +104,7 @@
     "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.5.0",
     "sane": "^5.0.1",
-    "semver": "^7.8.0",
+    "semver": "^7.8.1",
     "semver-deprecate": "^1.1.0",
     "silent-error": "^1.1.1",
     "sort-package-json": "^3.6.1",
@@ -114,12 +112,14 @@
     "testem": "^3.20.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
-    "walk-sync": "^4.0.1",
+    "walk-sync": "^4.0.2",
     "watch-detector": "^1.0.2",
     "workerpool": "^10.0.2",
     "yam": "^1.0.0",
-    "@ember-tooling/classic-build-addon-blueprint": "7.1.0-beta.1",
-    "@ember-tooling/classic-build-app-blueprint": "7.1.0-beta.1"
+    "@ember-tooling/blueprint-blueprint": "0.3.0",
+    "@ember-tooling/classic-build-app-blueprint": "7.2.0-alpha.1",
+    "@ember-tooling/classic-build-addon-blueprint": "7.2.0-alpha.1",
+    "@ember-tooling/blueprint-model": "0.7.0"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.7",
@@ -140,7 +140,7 @@
     "fixturify-project": "^2.1.1",
     "jsdom": "^21.1.2",
     "latest-version": "^9.0.0",
-    "mocha": "^11.7.5",
+    "mocha": "^11.7.6",
     "nock": "^14.0.15",
     "nyc": "^17.1.0",
     "prettier": "3.7.4",

package/packages/addon-blueprint/files/README.md

@@ -18,6 +18,16 @@ ember install <%= addonName %>
 
 [Longer description of how to use the addon in apps.]
 
+> TODO: Document the package's public API.
+>
+> For each public api (including components, helpers, modifiers, and other apis) include:
+>
+> - The import path for a consumer (e.g. `import MyAddonsComponent from 'my-addon/components/my-addons-component'`)
+> - What it does
+> - Parameters/options
+> - Return value
+> - Example usage
+
 ## Contributing
 
 See the [Contributing](CONTRIBUTING.md) guide for details.

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "7.1.0-beta.1",
+  "version": "7.2.0-alpha.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,7 +11,7 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.6.3",
+    "@ember-tooling/blueprint-model": "workspace:*",
     "chalk": "^5.6.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -26,7 +26,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   }
 }

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

@@ -63,7 +63,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
     "ember-auto-import": "^2.13.1",
-    "ember-cli": "~7.1.0-beta.1",
+    "ember-cli": "~7.2.0-alpha.1",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-clean-css": "^3.0.0",
@@ -79,7 +79,7 @@
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.2.0",
-    "ember-source": "~7.1.0-beta.1",
+    "ember-source": "~7.2.0-alpha.3",
     "ember-template-imports": "^4.4.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^8.0.5<% } %>",
@@ -98,8 +98,8 @@
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^36.0.1<% if (typescript) { %>",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.59.3<% } %>",
-    "webpack": "^5.106.2"
+    "typescript-eslint": "^8.59.4<% } %>",
+    "webpack": "^5.107.1"
   },
   "engines": {
     "node": ">= 20.19"

package/packages/app-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "7.1.0-beta.1",
+  "version": "7.2.0-alpha.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,7 +11,7 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.6.3",
+    "@ember-tooling/blueprint-model": "workspace:*",
     "chalk": "^5.6.2",
     "ember-cli-string-utils": "^1.1.0"
   },
@@ -20,7 +20,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   }
 }

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

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

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

package/packages/blueprint-blueprint/package.json

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

package/{lib/models/blueprint.js → packages/blueprint-model/index.js}

@@ -5,11 +5,11 @@
 */
 const FileInfo = require('@ember-tooling/blueprint-model/utilities/file-info');
 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 MarkdownColor = require('@ember-tooling/blueprint-model/utilities/markdown-color');
+const sequence = require('./utilities/sequence');
+const printCommand = require('@ember-tooling/blueprint-model/utilities/print-command');
+const insertIntoFile = require('@ember-tooling/blueprint-model/utilities/insert-into-file');
+const cleanRemove = require('@ember-tooling/blueprint-model/utilities/clean-remove');
 const fs = require('fs-extra');
 const { pluralize } = require('inflection');
 const { minimatch } = require('minimatch');
@@ -28,7 +28,7 @@ const CoreObject = require('core-object');
 const EOL = require('os').EOL;
 const logger = require('heimdalljs-logger')('ember-cli:blueprint');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const isAddon = require('../utilities/is-addon');
+const isAddon = require('@ember-tooling/blueprint-model/utilities/is-addon');
 
 const initialIgnoredFiles = ['.DS_Store'];
 
@@ -1474,7 +1474,11 @@ Blueprint.load = function (blueprintPath, blueprintOptions) {
 
     let constructorPath = path.resolve(blueprintPath, 'index.js');
     if (Blueprint._existsSync(constructorPath)) {
-      const blueprintModule = require(constructorPath);
+      let blueprintModule = require(constructorPath);
+
+      if (blueprintModule.__esModule) {
+        blueprintModule = blueprintModule.default;
+      }
 
       if (typeof blueprintModule === 'function') {
         Constructor = blueprintModule;

package/packages/blueprint-model/node_modules/.bin/markdown-it

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/bin/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/bin/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../markdown-it/bin/markdown-it.mjs" "$@"
+else
+  exec node  "$basedir/../markdown-it/bin/markdown-it.mjs" "$@"
+fi

package/packages/blueprint-model/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@ember-tooling/blueprint-model",
+  "version": "0.7.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ember-cli/ember-cli.git",
+    "directory": "packages/blueprint-model"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "babel-remove-types": "^2.0.0",
+    "chalk": "^5.6.2",
+    "content-tag": "^4.0.0",
+    "core-object": "^3.1.5",
+    "diff": "^8.0.4",
+    "ember-cli-normalize-entity-name": "^1.0.0",
+    "ember-cli-string-utils": "^1.1.0",
+    "fs-extra": "^11.3.4",
+    "heimdalljs-logger": "^0.1.10",
+    "inflection": "^3.0.2",
+    "isbinaryfile": "^5.0.7",
+    "lodash": "^4.17.23",
+    "markdown-it": "^14.1.0",
+    "markdown-it-terminal": "^0.4.0",
+    "minimatch": "^10.1.1",
+    "promise.hash.helper": "^1.0.8",
+    "quick-temp": "^0.1.9",
+    "silent-error": "^1.1.1",
+    "walk-sync": "^4.0.0"
+  }
+}

package/packages/blueprint-model/utilities/directory-for-package-name.js

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

@@ -0,0 +1,64 @@
+'use strict';
+
+const fs = require('fs');
+const util = require('util');
+const { applyPatch, createPatch } = 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 = 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 = 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

@@ -0,0 +1,63 @@
+'use strict';
+
+const { default: 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,
+};