ember-cli 5.3.0 → 5.4.0

package/lib/cli/cli.js

@@ -32,12 +32,6 @@ class CLI {
      */
     this.ui = options.ui;
 
-    /**
-     * @private
-     * @property analytics
-     */
-    this.analytics = options.analytics;
-
     /**
      * @private
      * @property testing
@@ -107,7 +101,6 @@ class CLI {
      */
     let command = new CurrentCommand({
       ui: this.ui,
-      analytics: this.analytics,
       commands: this._environment.commands,
       tasks: this._environment.tasks,
       project: this._environment.project,
@@ -248,7 +241,6 @@ class CLI {
 
     let help = new HelpCommand({
       ui: this.ui,
-      analytics: this.analytics,
       commands: environment.commands,
       tasks: environment.tasks,
       project: environment.project,

package/lib/cli/index.js

@@ -17,16 +17,10 @@ if (instrumentation.instrumentationEnabled()) {
 
 // Main entry point
 const requireAsHash = require('../utilities/require-as-hash');
-const packageConfig = require('../../package.json');
-const logger = require('heimdalljs-logger')('ember-cli:cli/index');
 const { merge } = require('ember-cli-lodash-subset');
 const path = require('path');
 const heimdall = require('heimdalljs');
 
-let version = packageConfig.version;
-let name = packageConfig.name;
-let trackingCode = packageConfig.trackingCode;
-
 function loadCommands() {
   let token = heimdall.start('load-commands');
   const Command = require('../models/command');
@@ -43,20 +37,6 @@ function loadTasks() {
   return hash;
 }
 
-function clientId() {
-  const ConfigStore = require('configstore');
-  let configStore = new ConfigStore('ember-cli');
-  let id = configStore.get('client-id');
-
-  if (id) {
-    return id;
-  } else {
-    id = require('uuid').v4().toString();
-    configStore.set('client-id', id);
-    return id;
-  }
-}
-
 function configureLogger(env) {
   let depth = Number(env['DEBUG_DEPTH']);
   if (depth) {
@@ -74,7 +54,6 @@ module.exports = async function (options) {
   try {
     let UI = options.UI || require('console-ui');
     const CLI = require('./cli');
-    let Leek = options.Leek || require('leek');
     const Project = require('../models/project');
     let config = getConfig(options.Yam);
 
@@ -90,40 +69,8 @@ module.exports = async function (options) {
       writeLevel: process.argv.indexOf('--silent') !== -1 ? 'ERROR' : undefined,
     });
 
-    let leekOptions;
-
-    let disableAnalytics =
-      (options.cliArgs &&
-        (options.cliArgs.indexOf('--disable-analytics') > -1 ||
-          options.cliArgs.indexOf('-v') > -1 ||
-          options.cliArgs.indexOf('--version') > -1)) ||
-      config.get('disableAnalytics');
-
-    let defaultLeekOptions = {
-      trackingCode,
-      globalName: name,
-      name: clientId(),
-      version,
-      silent: disableAnalytics,
-    };
-
-    let defaultUpdateCheckerOptions = {
-      checkForUpdates: false,
-    };
-
-    if (config.get('leekOptions')) {
-      leekOptions = merge(defaultLeekOptions, config.get('leekOptions'));
-    } else {
-      leekOptions = defaultLeekOptions;
-    }
-
-    logger.info('leek: %o', leekOptions);
-
-    let leek = new Leek(leekOptions);
-
     let cli = new CLI({
       ui,
-      analytics: leek,
       testing: options.testing,
       name: options.cli ? options.cli.name : 'ember',
       disableDependencyChecker: options.disableDependencyChecker,
@@ -134,6 +81,10 @@ module.exports = async function (options) {
 
     let project = Project.projectOrnullProject(ui, cli);
 
+    let defaultUpdateCheckerOptions = {
+      checkForUpdates: false,
+    };
+
     let environment = {
       tasks: loadTasks(),
       cliArgs: options.cliArgs,

package/lib/commands/addon.js

@@ -13,8 +13,11 @@ module.exports = NewCommand.extend({
     { name: 'blueprint', type: String, default: 'addon', aliases: ['b'] },
     { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
-    { name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
-    { name: 'pnpm', type: Boolean, default: false },
+    {
+      name: 'package-manager',
+      type: ['npm', 'pnpm', 'yarn'],
+      aliases: [{ npm: 'npm' }, { pnpm: 'pnpm' }, { yarn: 'yarn' }],
+    },
     { name: 'directory', type: String, aliases: ['dir'] },
     {
       name: 'lang',

package/lib/commands/init.js

@@ -7,9 +7,8 @@ const chalk = require('chalk');
 const isValidProjectName = require('../utilities/valid-project-name');
 const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
-const isYarnProject = require('../utilities/is-yarn-project');
+const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 const getLangArg = require('../../lib/utilities/get-lang-arg');
-const { getPackageManagerFromFlags } = require('../utilities/get-package-manager-from-flags');
 
 module.exports = Command.extend({
   name: 'init',
@@ -28,8 +27,11 @@ module.exports = Command.extend({
       default: true,
       description: 'Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.',
     },
-    { name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
-    { name: 'pnpm', type: Boolean, default: false },
+    {
+      name: 'package-manager',
+      type: ['npm', 'pnpm', 'yarn'],
+      aliases: [{ npm: 'npm' }, { pnpm: 'pnpm' }, { yarn: 'yarn' }],
+    },
     { name: 'name', type: String, default: '', aliases: ['n'] },
     {
       name: 'lang',
@@ -80,12 +82,16 @@ module.exports = Command.extend({
       commandOptions.lang = getLangArg(commandOptions.lang, this.ui);
     }
 
-    let blueprintOpts = clone(commandOptions);
-
-    if (blueprintOpts.yarn === undefined && project.isEmberCLIProject()) {
-      blueprintOpts.yarn = isYarnProject(project.root);
+    if (commandOptions.packageManager === undefined && project.isEmberCLIProject()) {
+      if (await isPnpmProject(project.root)) {
+        commandOptions.packageManager = 'pnpm';
+      } else if (isYarnProject(project.root)) {
+        commandOptions.packageManager = 'yarn';
+      }
     }
 
+    let blueprintOpts = clone(commandOptions);
+
     merge(blueprintOpts, {
       rawName: packageName,
       targetFiles: rawArgs || '',
@@ -100,12 +106,10 @@ module.exports = Command.extend({
 
     await this.runTask('InstallBlueprint', blueprintOpts);
 
-    let packageManager = getPackageManagerFromFlags(commandOptions);
-
     if (!commandOptions.skipNpm) {
       await this.runTask('NpmInstall', {
         verbose: commandOptions.verbose,
-        packageManager,
+        packageManager: commandOptions.packageManager,
       });
     }
 
@@ -117,11 +121,11 @@ module.exports = Command.extend({
 
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('🎉', `Successfully created project ${chalk.yellow(projectName)}.`));
-    this.ui.writeLine(prependEmoji('👉 ', 'Get started by typing:'));
+    this.ui.writeLine(prependEmoji('👉', 'Get started by typing:'));
     this.ui.writeLine('');
     const command = `cd ${projectName}`;
     this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(command)}`);
-    this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(`${packageManager ?? 'npm'} start`)}`);
+    this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(`${commandOptions.packageManager ?? 'npm'} start`)}`);
     this.ui.writeLine('');
     this.ui.writeLine('Happy coding!');
   },

package/lib/commands/install.js

@@ -2,6 +2,7 @@
 
 const Command = require('../models/command');
 const SilentError = require('silent-error');
+const { determineInstallCommand } = require('../utilities/package-managers');
 
 module.exports = Command.extend({
   name: 'install',
@@ -20,18 +21,19 @@ module.exports = Command.extend({
         'Use this option to force the usage of a specific package manager. ' +
         'By default, ember-cli will try to detect the right package manager ' +
         'from any lockfiles that exist in your project.',
-      aliases: [{ yarn: 'yarn' }, { pnpm: 'pnpm' }],
+      aliases: [{ npm: 'npm' }, { pnpm: 'pnpm' }, { yarn: 'yarn' }],
     },
   ],
 
   anonymousOptions: ['<addon-name>'],
 
-  run(commandOptions, addonNames) {
+  async run(commandOptions, addonNames) {
     if (!addonNames.length) {
-      let msg = 'The `install` command must take an argument with the name';
-      msg += ' of an ember-cli addon. For installing all npm ';
-      msg += 'dependencies you can run `npm install`.';
-      return Promise.reject(new SilentError(msg));
+      let installCommand = await determineInstallCommand(this.project.root);
+
+      throw new SilentError(
+        `An addon's name is required when running the \`install\` command. If you want to install all node modules, please run \`${installCommand}\` instead.`
+      );
     }
 
     return this.runTask('AddonInstall', {
@@ -43,7 +45,6 @@ module.exports = Command.extend({
   _env() {
     return {
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       NpmInstallTask: this.tasks.NpmInstall,
       BlueprintTask: this.tasks.GenerateFromBlueprint,

package/lib/commands/new.js

@@ -25,8 +25,11 @@ module.exports = Command.extend({
       default: true,
       description: 'Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.',
     },
-    { name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
-    { name: 'pnpm', type: Boolean, default: false },
+    {
+      name: 'package-manager',
+      type: ['npm', 'pnpm', 'yarn'],
+      aliases: [{ npm: 'npm' }, { pnpm: 'pnpm' }, { yarn: 'yarn' }],
+    },
     { name: 'directory', type: String, aliases: ['dir'] },
     {
       name: 'lang',
@@ -74,8 +77,7 @@ module.exports = Command.extend({
       }
 
       if (answers.packageManager) {
-        commandOptions.yarn = answers.packageManager === 'yarn';
-        commandOptions.pnpm = answers.packageManager === 'pnpm';
+        commandOptions.packageManager = answers.packageManager;
       }
 
       if (answers.ciProvider) {
@@ -110,7 +112,6 @@ module.exports = Command.extend({
 
     let initCommand = new InitCommand({
       ui: this.ui,
-      analytics: this.analytics,
       tasks: this.tasks,
       project: Project.nullProject(this.ui, this.cli),
     });

package/lib/models/blueprint.js

@@ -1240,7 +1240,7 @@ let Blueprint = CoreObject.extend({
 
   /**
     Used to retrieve a task with the given name. Passes the new task
-    the standard information available (like `ui`, `analytics`, `project`, etc).
+    the standard information available (like `ui`, `project`, etc).
 
     @method taskFor
     @param dasherizedName
@@ -1252,7 +1252,6 @@ let Blueprint = CoreObject.extend({
     return new Task({
       ui: this.ui,
       project: this.project,
-      analytics: this.analytics,
     });
   },
 

package/lib/models/command.js

@@ -15,7 +15,7 @@ const WatchDetector = require('watch-detector');
 const SilentError = require('silent-error');
 const execSync = require('child_process').execSync;
 const fs = require('fs');
-const isYarnProject = require('../utilities/is-yarn-project');
+const { determineInstallCommand } = require('../utilities/package-managers');
 
 let cache = {};
 
@@ -197,7 +197,6 @@ let Command = CoreObject.extend({
   _env(/* name */) {
     return {
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       testing: this.testing,
       settings: this.settings,
@@ -257,65 +256,60 @@ let Command = CoreObject.extend({
     @method validateAndRun
     @return {Promise}
   */
-  validateAndRun(args) {
-    return new Promise((resolve, reject) => {
-      let commandOptions = this.parseArgs(args);
-      // if the help option was passed, resolve with 'callHelp' to call help command
-      if (commandOptions && (commandOptions.options.help || commandOptions.options.h)) {
-        logger.info(`${this.name} called with help option`);
-        return resolve('callHelp');
-      }
+  async validateAndRun(args) {
+    let commandOptions = this.parseArgs(args);
 
-      this.analytics.track({
-        name: 'ember ',
-        message: this.name,
-      });
+    // If the `help` option was passed, resolve with `callHelp` to call the `help` command:
+    if (commandOptions && (commandOptions.options.help || commandOptions.options.h)) {
+      logger.info(`${this.name} called with help option`);
 
-      if (commandOptions === null) {
-        return reject();
-      }
+      return 'callHelp';
+    }
 
-      if (this.works === 'outsideProject' && this.isWithinProject) {
-        throw new SilentError(`You cannot use the ${chalk.green(this.name)} command inside an ember-cli project.`);
-      }
+    if (commandOptions === null) {
+      throw new SilentError();
+    }
 
-      if (this.works === 'insideProject') {
-        if (!this.project.hasDependencies()) {
-          if (!this.isWithinProject && !this.project.isEmberCLIAddon()) {
-            throw new SilentError(
-              `You have to be inside an ember-cli project to use the ${chalk.green(this.name)} command.`
-            );
-          }
-
-          let installCommand = 'npm install';
-          if (isYarnProject(this.project.root)) {
-            installCommand = 'yarn install';
-          }
+    if (this.works === 'outsideProject' && this.isWithinProject) {
+      throw new SilentError(`You cannot use the ${chalk.green(this.name)} command inside an ember-cli project.`);
+    }
+
+    if (this.works === 'insideProject') {
+      if (!this.project.hasDependencies()) {
+        if (!this.isWithinProject && !this.project.isEmberCLIAddon()) {
           throw new SilentError(
-            `Required packages are missing, run \`${installCommand}\` from this directory to install them.`
+            `You have to be inside an ember-cli project to use the ${chalk.green(this.name)} command.`
           );
         }
-      }
-
-      let detector = new WatchDetector({
-        ui: this.ui,
-        childProcess: { execSync },
-        fs,
-        watchmanSupportsPlatform: /^win/.test(process.platform),
-        cache,
-        root: this.project.root,
-      });
 
-      let options = commandOptions.options;
+        let installCommand = await determineInstallCommand(this.project.root);
 
-      if (this.hasOption('watcher')) {
-        // do stuff to try and provide a good experience when it comes to file watching
-        let watchPreference = detector.findBestWatcherOption(options);
-        this.project._watchmanInfo = watchPreference.watchmanInfo;
-        options.watcher = watchPreference.watcher;
+        throw new SilentError(
+          `Required packages are missing, run \`${installCommand}\` from this directory to install them.`
+        );
       }
-      resolve(this.run(options, commandOptions.args));
+    }
+
+    let detector = new WatchDetector({
+      ui: this.ui,
+      childProcess: { execSync },
+      fs,
+      watchmanSupportsPlatform: /^win/.test(process.platform),
+      cache,
+      root: this.project.root,
     });
+
+    let options = commandOptions.options;
+
+    if (this.hasOption('watcher')) {
+      // Do stuff to try and provide a good experience when it comes to file watching:
+      let watchPreference = detector.findBestWatcherOption(options);
+
+      this.project._watchmanInfo = watchPreference.watchmanInfo;
+      options.watcher = watchPreference.watcher;
+    }
+
+    return this.run(options, commandOptions.args);
   },
 
   /**

package/lib/models/watcher.js

@@ -115,9 +115,6 @@ module.exports = class Watcher extends CoreObject {
   didError(error) {
     logger.info('didError %o', error);
     this.ui.writeError(error);
-    this.analytics.trackError({
-      description: error && error.name,
-    });
   }
 
   didChange(results) {
@@ -135,24 +132,6 @@ module.exports = class Watcher extends CoreObject {
 
     this.ui.writeLine(message);
 
-    this.analytics.track({
-      name: 'ember rebuild',
-      message: `broccoli rebuild time: ${totalTime}ms`,
-    });
-
-    /*
-     * We use the `rebuild` category in our analytics setup for both builds
-     * and rebuilds. This is a bit confusing, but the actual thing we
-     * delineate on in the reports is the `variable` value below. This is
-     * used both here and in `lib/tasks/build.js`.
-     */
-    this.analytics.trackTiming({
-      category: 'rebuild',
-      variable: 'rebuild time',
-      label: 'broccoli rebuild time',
-      value: Number(totalTime),
-    });
-
     if (this.verbose) {
       printSlowTrees(results.graph.__heimdall__);
     }

package/lib/tasks/addon-install.js

@@ -4,7 +4,6 @@ const Task = require('../models/task');
 const SilentError = require('silent-error');
 const { merge } = require('ember-cli-lodash-subset');
 const getPackageBaseName = require('../utilities/get-package-base-name');
-const { getPackageManagerFromFlags } = require('../utilities/get-package-manager-from-flags');
 
 class AddonInstallTask extends Task {
   constructor(options) {
@@ -23,28 +22,24 @@ class AddonInstallTask extends Task {
 
     let npmInstall = new this.NpmInstallTask({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
     });
 
     let blueprintInstall = new this.BlueprintTask({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       testing: this.testing,
     });
 
     ui.startProgress(chalk.green('Installing addon package'), chalk.green('.'));
 
-    let packageManager = getPackageManagerFromFlags(commandOptions);
-
     return npmInstall
       .run({
         packages: packageNames,
         save: commandOptions.save,
         'save-dev': !commandOptions.save,
         'save-exact': commandOptions.saveExact,
-        packageManager,
+        packageManager: commandOptions.packageManager,
       })
       .then(() => this.project.reloadAddons())
       .then(() => this.installBlueprint(blueprintInstall, packageNames, blueprintOptions))

package/lib/tasks/build-watch.js

@@ -39,7 +39,6 @@ class BuildWatchTask extends Task {
         await Watcher.build({
           ui,
           builder,
-          analytics: this.analytics,
           options,
           ignored: [path.resolve(this.project.root, options.outputPath)],
         })

package/lib/tasks/build.js

@@ -8,7 +8,6 @@ module.exports = class BuildTask extends Task {
   // Options: String outputPath
   async run(options) {
     let ui = this.ui;
-    let analytics = this.analytics;
 
     let builder = new Builder({
       ui,
@@ -29,26 +28,7 @@ module.exports = class BuildTask extends Task {
         changedFiles: [],
       };
 
-      let results = await builder.build(null, annotation);
-      let totalTime = results.totalTime / 1e6;
-
-      analytics.track({
-        name: 'ember build',
-        message: `${totalTime}ms`,
-      });
-
-      /*
-       * We use the `rebuild` category in our analytics setup for both builds
-       * and rebuilds. This is a bit confusing, but the actual thing we
-       * delineate on in the reports is the `variable` value below. This is
-       * used both here and in `lib/models/watcher.js`.
-       */
-      analytics.trackTiming({
-        category: 'rebuild',
-        variable: 'build time',
-        label: 'broccoli build time',
-        value: parseInt(totalTime, 10),
-      });
+      await builder.build(null, annotation);
     } finally {
       ui.stopProgress();
       await builder.cleanup();

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

@@ -37,7 +37,6 @@ class GenerateTask extends Task {
       target: this.project.root,
       entity,
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       settings: this.settings,
       testing: this.testing,

package/lib/tasks/install-blueprint.js

@@ -35,7 +35,6 @@ class InstallBlueprintTask extends Task {
       target,
       entity: { name },
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       dryRun: options.dryRun,
       targetFiles: options.targetFiles,

package/lib/tasks/interactive-new.js

@@ -81,7 +81,7 @@ class InteractiveNewTask extends Task {
         name: 'packageManager',
         type: 'list',
         message: 'Pick the package manager to use when installing dependencies:',
-        when: !newCommandOptions.yarn,
+        when: !newCommandOptions.packageManager,
         choices: [
           {
             name: 'NPM',

package/lib/tasks/npm-install.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// Runs `npm install` in cwd
 const path = require('path');
 const fs = require('fs');
 const NpmTask = require('./npm-task');
@@ -17,7 +16,7 @@ class NpmInstallTask extends NpmTask {
     let packageJson = path.join(this.project.root, 'package.json');
 
     if (!fs.existsSync(packageJson)) {
-      ui.writeWarnLine('Skipping npm install: package.json not found');
+      ui.writeWarnLine('Skipping install: `package.json` not found.');
       return Promise.resolve();
     } else {
       return super.run(options);

package/lib/tasks/npm-task.js

@@ -1,13 +1,10 @@
 'use strict';
 
-// Runs `npm install` in cwd
-
 const chalk = require('chalk');
 const execa = require('../utilities/execa');
-const findUp = require('find-up');
 const semver = require('semver');
 const SilentError = require('silent-error');
-const isYarnProject = require('../utilities/is-yarn-project');
+const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 
 const logger = require('heimdalljs-logger')('ember-cli:npm-task');
 
@@ -50,8 +47,8 @@ class NpmTask extends Task {
     return isYarnProject(this.project.root);
   }
 
-  async hasPNPMLock() {
-    return Boolean(await findUp('pnpm-lock.yaml', { cwd: this.project.root }));
+  hasPNPMLock() {
+    return isPnpmProject(this.project.root);
   }
 
   async checkYarn() {

package/lib/tasks/serve.js

@@ -59,7 +59,6 @@ class ServeTask extends Task {
         await Watcher.build({
           ui: this.ui,
           builder,
-          analytics: this.analytics,
           options,
           serving: true,
           ignored: [path.resolve(this.project.root, options.outputPath)],
@@ -72,7 +71,6 @@ class ServeTask extends Task {
       serverWatcher = (
         await ServerWatcher.build({
           ui: this.ui,
-          analytics: this.analytics,
           watchedDir: path.resolve(serverRoot),
           options,
         })
@@ -84,7 +82,6 @@ class ServeTask extends Task {
       new ExpressServer({
         ui: this.ui,
         project: this.project,
-        analytics: this.analytics,
         watcher,
         serverRoot,
         serverWatcher,

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

@@ -141,7 +141,6 @@ class ExpressServerTask extends Task {
     options.project = this.project;
     options.watcher = this.watcher;
     options.serverWatcher = this.serverWatcher;
-    options.analytics = this.analytics;
     options.ui = this.ui;
 
     this.startOptions = options;
@@ -242,7 +241,6 @@ class ExpressServerTask extends Task {
         app: this.app,
         ui: options.ui,
         watcher: options.watcher,
-        analytics: options.analytics,
         project: options.project,
         httpServer: options.httpServer,
       });