ember-cli 6.7.0-alpha.1 → 6.7.0-alpha.2

package/lib/commands/init.js

@@ -131,7 +131,7 @@ module.exports = Command.extend({
     }
 
     const projectName = this.project.name();
-    const prependEmoji = require('../../lib/utilities/prepend-emoji');
+    const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
 
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('🎉', `Successfully created project ${chalk.yellow(projectName)}.`));

package/lib/models/blueprint.js

@@ -3,7 +3,7 @@
 /**
 @module ember-cli
 */
-const FileInfo = require('./file-info');
+const FileInfo = require('@ember-tooling/blueprint-model/utilities/file-info');
 const chalk = require('chalk');
 const MarkdownColor = require('../utilities/markdown-color');
 const sequence = require('../utilities/sequence');
@@ -21,6 +21,7 @@ const intersection = require('lodash/intersection');
 const cloneDeep = require('lodash/cloneDeep');
 const compact = require('lodash/compact');
 const uniq = require('lodash/uniq');
+const sortBy = require('lodash/sortBy');
 const walkSync = require('walk-sync');
 const SilentError = require('silent-error');
 const CoreObject = require('core-object');
@@ -216,7 +217,7 @@ let Blueprint = CoreObject.extend({
     this._super();
 
     this.path = blueprintPath;
-    this.name = path.basename(blueprintPath);
+    this.name = blueprintOptions?.name ?? path.basename(blueprintPath);
 
     this._processOptions(blueprintOptions);
   },
@@ -1249,23 +1250,6 @@ let Blueprint = CoreObject.extend({
 
     let previousCwd;
     if (!this.project.isEmberCLIProject()) {
-      // our blueprint ran *outside* an ember-cli project. So the only way this
-      // makes sense if the blueprint generated a new project, which we're now
-      // ready to add some addons into. So we need to switch from "outside" mode
-      // to "inside" by reinitializing the Project.
-      //
-      // One might think the cache clear is unnecessary, because in theory the
-      // caches should be shareable, but in practice the new Project we create
-      // below will have the same root dir as the NullProject and that makes bad
-      // things happen.
-      this.project.packageInfoCache._clear();
-      const Project = require('../../lib/models/project');
-      this.project = taskOptions.blueprintOptions.project = Project.closestSync(
-        options.blueprintOptions.target,
-        this.project.ui,
-        this.project.cli
-      );
-
       // The install task adds dependencies based on the current working directory.
       // But in case we created the new project by calling the blueprint with a custom target directory (options.target),
       // the current directory will *not* be the one the project is created in, so we must adjust this here.
@@ -1419,6 +1403,12 @@ let Blueprint = CoreObject.extend({
   },
 });
 
+const builtInBlueprints = new Map([
+  ['app', '@ember-tooling/classic-build-app-blueprint'],
+  ['addon', '@ember-tooling/classic-build-addon-blueprint'],
+  ['blueprint', '@ember-tooling/blueprint-blueprint'],
+]);
+
 /**
   @static
   @method lookup
@@ -1455,6 +1445,15 @@ Blueprint.lookup = function (name, options) {
     }
   }
 
+  // Check for the built in blueprints
+  if (builtInBlueprints.has(name)) {
+    let blueprintPath = require.resolve(builtInBlueprints.get(name));
+
+    if (Blueprint._existsSync(blueprintPath)) {
+      return Blueprint.load(path.dirname(blueprintPath), options.blueprintOptions);
+    }
+  }
+
   if (!options.ignoreMissing) {
     throw new SilentError(`Unknown blueprint: ${name}`);
   }
@@ -1522,9 +1521,24 @@ Blueprint.list = function (options) {
       }
     });
 
+    // if we're listing blueprints from ember-cli then we should add the built-in blueprints
+    if (source === 'ember-cli') {
+      for (let [blueprintName, blueprintPackage] of builtInBlueprints.entries()) {
+        let blueprint = Blueprint.load(path.dirname(require.resolve(blueprintPackage)), {
+          name: blueprintName,
+        });
+
+        let name = blueprintName;
+        blueprint.overridden = seen.includes(name);
+        seen.push(name);
+
+        blueprints.push(blueprint);
+      }
+    }
+
     return {
       source,
-      blueprints: compact(blueprints),
+      blueprints: sortBy(compact(blueprints), 'name'),
     };
   });
 };

package/lib/tasks/create-and-step-into-directory.js

@@ -6,7 +6,7 @@
 const fs = require('fs-extra');
 const Task = require('../models/task');
 const SilentError = require('silent-error');
-const directoryForPackageName = require('../utilities/directory-for-package-name');
+const directoryForPackageName = require('@ember-tooling/blueprint-model/utilities/directory-for-package-name');
 
 class CreateTask extends Task {
   // Options: String directoryName, Boolean: dryRun

package/lib/tasks/git-init.js

@@ -25,7 +25,7 @@ module.exports = class GitInitTask extends Task {
     if (!hasGit) {
       return;
     }
-    const prependEmoji = require('../../lib/utilities/prepend-emoji');
+    const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
     ui.writeLine('');
     ui.writeLine(prependEmoji('🎥', 'Initializing git repository.'));
     await this._gitInit();

package/lib/tasks/npm-task.js

@@ -192,7 +192,7 @@ class NpmTask extends Task {
     let startMessage = this.formatStartMessage(options.packages);
     let completeMessage = this.formatCompleteMessage(options.packages);
 
-    const prependEmoji = require('../../lib/utilities/prepend-emoji');
+    const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
 
     ui.writeLine('');
     ui.writeLine(prependEmoji('🚧', 'Installing packages... This might take a couple of minutes.'));

package/lib/utilities/lint-fix.js

@@ -2,7 +2,7 @@
 
 const execa = require('../utilities/execa');
 const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
-const prependEmoji = require('../utilities/prepend-emoji');
+const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
 
 async function run(project) {
   let lintFixScriptName = 'lint:fix';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.7.0-alpha.1",
+  "version": "6.7.0-alpha.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -116,7 +116,11 @@
     "walk-sync": "^3.0.0",
     "watch-detector": "^1.0.2",
     "workerpool": "^9.2.0",
-    "yam": "^1.0.0"
+    "yam": "^1.0.0",
+    "@ember-tooling/blueprint-blueprint": "0.0.1",
+    "@ember-tooling/blueprint-model": "0.0.1",
+    "@ember-tooling/classic-build-addon-blueprint": "6.7.0-alpha.2",
+    "@ember-tooling/classic-build-app-blueprint": "6.7.0-alpha.2"
   },
   "devDependencies": {
     "@octokit/rest": "^19.0.7",

package/{blueprints/addon → packages/addon-blueprint}/index.js

@@ -13,9 +13,15 @@ const { sortPackageJson } = require('sort-package-json');
 let date = new Date();
 
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const stringifyAndNormalize = require('../../lib/utilities/stringify-and-normalize');
-const directoryForPackageName = require('../../lib/utilities/directory-for-package-name');
-const FileInfo = require('../../lib/models/file-info');
+
+const directoryForPackageName = require('@ember-tooling/blueprint-model/utilities/directory-for-package-name');
+const FileInfo = require('@ember-tooling/blueprint-model/utilities/file-info');
+
+const blueprintVersion = require('./package.json').version;
+
+function stringifyAndNormalize(contents) {
+  return `${JSON.stringify(contents, null, 2)}\n`;
+}
 
 const replacers = {
   'package.json'(content) {
@@ -175,10 +181,9 @@ module.exports = {
   },
 
   beforeInstall() {
-    const version = require('../../package.json').version;
-    const prependEmoji = require('../../lib/utilities/prepend-emoji');
+    const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
 
-    this.ui.writeLine(chalk.blue(`Ember CLI v${version}`));
+    this.ui.writeLine(chalk.blue(`@ember-tooling/classic-build-addon-blueprint v${blueprintVersion}`));
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('✨', `Creating a new Ember addon in ${chalk.yellow(process.cwd())}:`));
   },
@@ -231,7 +236,7 @@ module.exports = {
       namespace,
       addonName,
       addonNamespace,
-      emberCLIVersion: require('../../package').version,
+      blueprintVersion,
       year: date.getFullYear(),
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',

package/packages/addon-blueprint/node_modules/.bin/sort-package-json

@@ -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/sort-package-json@2.12.0/node_modules/sort-package-json/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/sort-package-json@2.12.0/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/sort-package-json@2.12.0/node_modules/sort-package-json/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/sort-package-json@2.12.0/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/../sort-package-json/cli.js" "$@"
+else
+  exec node  "$basedir/../sort-package-json/cli.js" "$@"
+fi

package/packages/addon-blueprint/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "@ember-tooling/classic-build-addon-blueprint",
+  "version": "6.7.0-alpha.2",
+  "dependencies": {
+    "@ember-tooling/blueprint-model": "workspace:*",
+    "chalk": "^4.1.2",
+    "ember-cli-normalize-entity-name": "^1.0.0",
+    "ember-cli-string-utils": "^1.1.0",
+    "fs-extra": "^11.3.0",
+    "lodash": "^4.17.21",
+    "silent-error": "^1.1.1",
+    "sort-package-json": "^2.12.0",
+    "walk-sync": "^3.0.0"
+  },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
+  }
+}

package/{blueprints/app → packages/app-blueprint}/files/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "<%= emberCLIVersion %>",
+      "version": "<%= blueprintVersion %>",
       "blueprints": [
         {
           "name": "<%= blueprint %>",

package/{blueprints/app → packages/app-blueprint}/files/package.json

@@ -60,7 +60,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.1.2",
     "ember-auto-import": "^2.10.0",
-    "ember-cli": "~<%= emberCLIVersion %>",
+    "ember-cli": "~6.7.0-alpha.1",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",

package/{blueprints/app → packages/app-blueprint}/index.js

@@ -2,10 +2,12 @@
 
 const stringUtil = require('ember-cli-string-utils');
 const chalk = require('chalk');
-const { isExperimentEnabled } = require('../../lib/experiments');
-const directoryForPackageName = require('../../lib/utilities/directory-for-package-name');
+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;
 
 module.exports = {
+  name: '@ember-tooling/classic-build-app-blueprint',
   description: 'The default blueprint for ember-cli projects.',
 
   shouldTransformTypeScript: true,
@@ -66,7 +68,7 @@ module.exports = {
       name,
       modulePrefix: name,
       namespace,
-      emberCLIVersion: require('../../package').version,
+      blueprintVersion,
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
       npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
@@ -119,10 +121,8 @@ module.exports = {
   },
 
   beforeInstall() {
-    const version = require('../../package.json').version;
-    const prependEmoji = require('../../lib/utilities/prepend-emoji');
-
-    this.ui.writeLine(chalk.blue(`Ember CLI v${version}`));
+    const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
+    this.ui.writeLine(chalk.blue(`@ember-tooling/classic-build-app-blueprint v${blueprintVersion}`));
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('✨', `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`));
   },

package/packages/app-blueprint/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@ember-tooling/classic-build-app-blueprint",
+  "version": "6.7.0-alpha.2",
+  "dependencies": {
+    "@ember-tooling/blueprint-model": "workspace:*",
+    "chalk": "^4.1.2",
+    "ember-cli-string-utils": "^1.1.0"
+  },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
+  }
+}

package/packages/blueprint-blueprint/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@ember-tooling/blueprint-blueprint",
+  "version": "0.0.1"
+}

package/packages/blueprint-model/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "@ember-tooling/blueprint-model",
+  "version": "0.0.1",
+  "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/{lib/models → packages/blueprint-model/utilities}/edit-file-diff.js

@@ -6,7 +6,7 @@ const jsdiff = require('diff');
 const quickTemp = require('quick-temp');
 const path = require('path');
 const SilentError = require('silent-error');
-const openEditor = require('../utilities/open-editor');
+const openEditor = require('./open-editor');
 const hash = require('promise.hash.helper');
 
 const readFile = util.promisify(fs.readFile);

package/{lib/models → packages/blueprint-model/utilities}/file-info.js

@@ -8,8 +8,8 @@ const EOL = require('os').EOL;
 const rxEOL = new RegExp(EOL, 'g');
 const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
 const hash = require('promise.hash.helper');
-const canEdit = require('../utilities/open-editor').canEdit;
-const processTemplate = require('../utilities/process-template');
+const canEdit = require('./open-editor').canEdit;
+const processTemplate = require('./process-template');
 
 const readFile = util.promisify(fs.readFile);
 const lstat = util.promisify(fs.stat);

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+packages:
+  - packages/*