ember-cli 3.28.3 → 4.0.0-beta.3

package/lib/broccoli/ember-app.js

@@ -84,7 +84,7 @@ class EmberApp {
    - trees, defaults to `{}`
    - jshintrc, defaults to `{}`
    - vendorFiles, defaults to `{}`
-   - addons, defaults to `{ blacklist: [], whitelist: [] }`
+   - addons, defaults to `{ exclude: [], include: [] }`
 
    @class EmberApp
    @constructor
@@ -170,10 +170,12 @@ class EmberApp {
     this._cachedAddonBundles = {};
 
     if (this.project.perBundleAddonCache && this.project.perBundleAddonCache.numProxies > 0) {
-      if (this.options.addons.whitelist && this.options.addons.whitelist.length) {
+      if (this.options.addons.include && this.options.addons.include.length) {
+        let optionKey = this.options.addons.hasWhitelist ? 'whitelist' : 'include';
+
         throw new Error(
           [
-            '[ember-cli] addon bundle caching is disabled for apps that specify an addon `whitelist`',
+            `[ember-cli] addon bundle caching is disabled for apps that specify an addon "${optionKey}"`,
             '',
             'All addons using bundle caching:',
             ...this.project.perBundleAddonCache.getPathsToAddonsOptedIn(),
@@ -181,10 +183,12 @@ class EmberApp {
         );
       }
 
-      if (this.options.addons.blacklist && this.options.addons.blacklist.length) {
+      if (this.options.addons.exclude && this.options.addons.exclude.length) {
+        let optionKey = this.options.addons.hasBlacklist ? 'blacklist' : 'exclude';
+
         throw new Error(
           [
-            '[ember-cli] addon bundle caching is disabled for apps that specify an addon `blacklist`',
+            `[ember-cli] addon bundle caching is disabled for apps that specify an addon "${optionKey}"`,
             '',
             'All addons using bundle caching:',
             ...this.project.perBundleAddonCache.getPathsToAddonsOptedIn(),
@@ -366,6 +370,40 @@ class EmberApp {
 
     this.options = defaultsDeep(options, detectedDefaultOptions, DEFAULT_CONFIG);
 
+    if (this.options.addons.blacklist) {
+      if (this.options.addons.exclude) {
+        throw new Error('Specifying both "blacklist" and "exclude" is not supported. Please use only one.');
+      }
+
+      this.options.addons.hasBlacklist = true;
+      this.options.addons.exclude = this.options.addons.blacklist;
+    }
+
+    Object.defineProperty(this.options.addons, 'blacklist', {
+      get() {
+        console.log(chalk.yellow('Please use "exclude" instead of "blacklist".'));
+
+        return this.exclude;
+      },
+    });
+
+    if (this.options.addons.whitelist) {
+      if (this.options.addons.include) {
+        throw new Error('Specifying both "whitelist" and "include" is not supported. Please use only one.');
+      }
+
+      this.options.addons.hasWhitelist = true;
+      this.options.addons.include = this.options.addons.whitelist;
+    }
+
+    Object.defineProperty(this.options.addons, 'whitelist', {
+      get() {
+        console.log(chalk.yellow('Please use "include" instead of "whitelist".'));
+
+        return this.include;
+      },
+    });
+
     // For now we must disable Babel sourcemaps due to unforeseen
     // performance regressions.
     if (!('sourceMaps' in this.options.babel)) {
@@ -555,24 +593,24 @@ class EmberApp {
 
   /**
     @private
-    @method _addonDisabledByBlacklist
+    @method _addonDisabledByExclude
     @param {Addon} addon
     @return {Boolean}
   */
-  _addonDisabledByBlacklist(addon) {
-    let blacklist = this.options.addons.blacklist;
-    return !!blacklist && blacklist.indexOf(addon.name) !== -1;
+  _addonDisabledByExclude(addon) {
+    let exclude = this.options.addons.exclude;
+    return !!exclude && exclude.indexOf(addon.name) !== -1;
   }
 
   /**
     @private
-    @method _addonDisabledByWhitelist
+    @method _addonDisabledByInclude
     @param {Addon} addon
     @return {Boolean}
   */
-  _addonDisabledByWhitelist(addon) {
-    let whitelist = this.options.addons.whitelist;
-    return !!whitelist && whitelist.indexOf(addon.name) === -1;
+  _addonDisabledByInclude(addon) {
+    let include = this.options.addons.include;
+    return !!include && include.indexOf(addon.name) === -1;
   }
 
   /**
@@ -616,7 +654,7 @@ class EmberApp {
       return false;
     }
 
-    return !this._addonDisabledByBlacklist(addon) && !this._addonDisabledByWhitelist(addon);
+    return !this._addonDisabledByExclude(addon) && !this._addonDisabledByInclude(addon);
   }
 
   /**
@@ -628,18 +666,22 @@ class EmberApp {
   _notifyAddonIncluded() {
     let addonNames = this.project.addons.map((addon) => addon.name);
 
-    if (this.options.addons.blacklist) {
-      this.options.addons.blacklist.forEach((addonName) => {
+    if (this.options.addons.exclude) {
+      let optionKey = this.options.addons.hasBlacklist ? 'blacklist' : 'exclude';
+
+      this.options.addons.exclude.forEach((addonName) => {
         if (addonNames.indexOf(addonName) === -1) {
-          throw new Error(`Addon "${addonName}" defined in blacklist is not found`);
+          throw new Error(`Addon "${addonName}" defined in "${optionKey}" is not found`);
         }
       });
     }
 
-    if (this.options.addons.whitelist) {
-      this.options.addons.whitelist.forEach((addonName) => {
+    if (this.options.addons.include) {
+      let optionKey = this.options.addons.hasWhitelist ? 'whitelist' : 'include';
+
+      this.options.addons.include.forEach((addonName) => {
         if (addonNames.indexOf(addonName) === -1) {
-          throw new Error(`Addon "${addonName}" defined in whitelist is not found`);
+          throw new Error(`Addon "${addonName}" defined in "${optionKey}" is not found`);
         }
       });
     }

package/lib/commands/addon.js

@@ -20,6 +20,12 @@ module.exports = NewCommand.extend({
       type: String,
       description: "Sets the base human language of the addon's own test application via index.html",
     },
+    {
+      name: 'ci-provider',
+      type: ['travis', 'github'],
+      default: 'github',
+      description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
+    },
   ],
 
   anonymousOptions: ['<addon-name>'],

package/lib/commands/init.js

@@ -37,6 +37,12 @@ module.exports = Command.extend({
       description: 'Sets the base human language of the application via index.html',
     },
     { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
+    {
+      name: 'ci-provider',
+      type: ['travis', 'github'],
+      default: 'github',
+      description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
+    },
   ],
 
   anonymousOptions: ['<glob-pattern>'],
@@ -59,6 +65,7 @@ module.exports = Command.extend({
 
     let project = this.project;
     let packageName = (commandOptions.name !== '.' && commandOptions.name) || project.name();
+    let ciProvider = commandOptions.ciProvider;
 
     if (!packageName) {
       let message =
@@ -75,7 +82,7 @@ module.exports = Command.extend({
 
     let blueprintOpts = clone(commandOptions);
 
-    if (blueprintOpts.yarn === undefined) {
+    if (blueprintOpts.yarn === undefined && project.isEmberCLIProject()) {
       blueprintOpts.yarn = isYarnProject(project.root);
     }
 
@@ -84,6 +91,7 @@ module.exports = Command.extend({
       targetFiles: rawArgs || '',
       rawArgs: rawArgs.toString(),
       blueprint: normalizeBlueprint(blueprintOpts.blueprint || this._defaultBlueprint()),
+      ciProvider,
     });
 
     if (!isValidProjectName(packageName)) {
@@ -93,9 +101,17 @@ module.exports = Command.extend({
     await this.runTask('InstallBlueprint', blueprintOpts);
 
     if (!commandOptions.skipNpm) {
+      let packageManager =
+        commandOptions.yarn === true
+          ? 'yarn'
+          : // supported for legacy reasons
+          commandOptions.yarn === false
+          ? 'npm'
+          : undefined;
+
       await this.runTask('NpmInstall', {
         verbose: commandOptions.verbose,
-        useYarn: commandOptions.yarn,
+        packageManager,
       });
     }
 

package/lib/commands/install.js

@@ -13,7 +13,15 @@ module.exports = Command.extend({
     { name: 'save', type: Boolean, default: false, aliases: ['S'] },
     { name: 'save-dev', type: Boolean, default: true, aliases: ['D'] },
     { name: 'save-exact', type: Boolean, default: false, aliases: ['E', 'exact'] },
-    { name: 'yarn', type: Boolean, description: 'Use --yarn to enforce yarn usage, or --no-yarn to enforce npm' }, // no default means use yarn if the blueprint has a yarn.lock
+    {
+      name: 'package-manager',
+      type: ['npm', 'pnpm', 'yarn'],
+      description:
+        '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' }],
+    },
   ],
 
   anonymousOptions: ['<addon-name>'],

package/lib/commands/new.js

@@ -35,6 +35,12 @@ module.exports = Command.extend({
       description: 'Sets the base human language of the application via index.html',
     },
     { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
+    {
+      name: 'ci-provider',
+      type: ['travis', 'github'],
+      default: 'github',
+      description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
+    },
   ],
 
   anonymousOptions: ['<app-name>'],

package/lib/models/blueprint.js

@@ -446,7 +446,7 @@ let Blueprint = CoreObject.extend({
     this.project = options.project;
     this.pod = options.pod;
     this.options = options;
-    this.hasPathToken = hasPathToken(this.files());
+    this.hasPathToken = hasPathToken(this.files(this.options));
 
     ui.writeLine(`installing ${this.name}`);
 
@@ -476,7 +476,7 @@ let Blueprint = CoreObject.extend({
     this.project = options.project;
     this.pod = options.pod;
     this.options = options;
-    this.hasPathToken = hasPathToken(this.files());
+    this.hasPathToken = hasPathToken(this.files(this.options));
 
     ui.writeLine(`uninstalling ${this.name}`);
 
@@ -717,7 +717,7 @@ let Blueprint = CoreObject.extend({
     @return {Array} files
   */
   _getFilesForInstall(targetFiles) {
-    let files = this.files();
+    let files = this.files(this.options);
 
     // if we've defined targetFiles, get file info on ones that match
     return (targetFiles && targetFiles.length > 0 && _.intersection(files, targetFiles)) || files;
@@ -765,7 +765,7 @@ let Blueprint = CoreObject.extend({
     @param {Object} templateVariables
   */
   processFilesForUninstall(intoDir, templateVariables) {
-    let fileInfos = this._getFileInfos(this.files(), intoDir, templateVariables);
+    let fileInfos = this._getFileInfos(this.files(this.options), intoDir, templateVariables);
 
     this._ignoreUpdateFiles();
 

package/lib/tasks/addon-install.js

@@ -35,13 +35,22 @@ class AddonInstallTask extends Task {
 
     ui.startProgress(chalk.green('Installing addon package'), chalk.green('.'));
 
+    let packageManager =
+      commandOptions.packageManager ||
+      (commandOptions.yarn === true
+        ? 'yarn'
+        : // supported for legacy reasons
+        commandOptions.yarn === false
+        ? 'npm'
+        : undefined);
+
     return npmInstall
       .run({
         packages: packageNames,
         save: commandOptions.save,
         'save-dev': !commandOptions.save,
         'save-exact': commandOptions.saveExact,
-        useYarn: commandOptions.yarn,
+        packageManager,
       })
       .then(() => this.project.reloadAddons())
       .then(() => this.installBlueprint(blueprintInstall, packageNames, blueprintOptions))

package/lib/tasks/install-blueprint.js

@@ -40,6 +40,7 @@ class InstallBlueprintTask extends Task {
       dryRun: options.dryRun,
       targetFiles: options.targetFiles,
       rawArgs: options.rawArgs,
+      ciProvider: options.ciProvider,
     };
 
     installOptions = merge(installOptions, options || {});

package/lib/tasks/npm-install.js

@@ -25,11 +25,11 @@ class NpmInstallTask extends NpmTask {
   }
 
   formatStartMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'npm'}: Installing ${formatPackageList(packages)} ...`;
+    return `${this.packageManagerOutputName}: Installing ${formatPackageList(packages)} ...`;
   }
 
   formatCompleteMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'npm'}: Installed ${formatPackageList(packages)}`;
+    return `${this.packageManagerOutputName}: Installed ${formatPackageList(packages)}`;
   }
 }
 

package/lib/tasks/npm-task.js

@@ -4,6 +4,7 @@
 
 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');
@@ -28,6 +29,10 @@ class NpmTask extends Task {
     this.versionConstraints = '3 || 4 || 5 || 6';
   }
 
+  get packageManagerOutputName() {
+    return this.packageManager.name;
+  }
+
   npm(args) {
     logger.info('npm: %j', args);
     return execa('npm', args, { preferLocal: false });
@@ -38,10 +43,19 @@ class NpmTask extends Task {
     return execa('yarn', args, { preferLocal: false });
   }
 
+  pnpm(args) {
+    logger.info('pnpm: %j', args);
+    return execa('pnpm', args, { preferLocal: false });
+  }
+
   hasYarnLock() {
     return isYarnProject(this.project.root);
   }
 
+  async hasPNPMLock() {
+    return Boolean(await findUp('pnpm-lock.yaml', { cwd: this.project.root }));
+  }
+
   async checkYarn() {
     try {
       let result = await this.yarn(['--version']);
@@ -54,9 +68,7 @@ class NpmTask extends Task {
         logger.info('yarn --version: %s', version);
       }
 
-      this.useYarn = true;
-
-      return { yarnVersion: version };
+      return { name: 'yarn', version };
     } catch (error) {
       logger.error('yarn --version failed: %s', error);
 
@@ -71,6 +83,28 @@ class NpmTask extends Task {
     }
   }
 
+  async checkPNPM() {
+    try {
+      let result = await this.pnpm(['--version']);
+      let version = result.stdout;
+
+      logger.info('pnpm --version: %s', version);
+
+      return { name: 'pnpm', version };
+    } catch (error) {
+      logger.error('pnpm --version failed: %s', error);
+
+      if (error.code === 'ENOENT') {
+        throw new SilentError(
+          'Ember CLI is now using pnpm, but was not able to find it.\n' +
+            'Please install pnpm using the instructions at https://pnpm.io/installation'
+        );
+      }
+
+      throw error;
+    }
+  }
+
   async checkNpmVersion() {
     try {
       let result = await this.npm(['--version']);
@@ -95,7 +129,7 @@ class NpmTask extends Task {
         );
       }
 
-      return { npmVersion: version };
+      return { name: 'npm', version };
     } catch (error) {
       logger.error('npm --version failed: %s', error);
 
@@ -124,37 +158,55 @@ class NpmTask extends Task {
    * @method findPackageManager
    * @return {Promise}
    */
-  async findPackageManager() {
-    if (this.useYarn === true) {
+  async findPackageManager(packageManager = null) {
+    if (packageManager === 'yarn') {
       logger.info('yarn requested -> trying yarn');
       return this.checkYarn();
     }
 
-    if (this.useYarn === false) {
+    if (packageManager === 'npm') {
       logger.info('npm requested -> using npm');
       return this.checkNpmVersion();
     }
 
-    if (!this.hasYarnLock()) {
-      logger.info('yarn.lock not found -> using npm');
-      return this.checkNpmVersion();
+    if (packageManager === 'pnpm') {
+      logger.info('pnpm requested -> using pnpm');
+      return this.checkPNPM();
     }
 
-    logger.info('yarn.lock found -> trying yarn');
-    try {
-      const yarnResult = await this.checkYarn();
-      logger.info('yarn found -> using yarn');
-      return yarnResult;
-    } catch (_err) {
-      logger.info('yarn not found -> using npm');
-      return this.checkNpmVersion();
+    if (this.hasYarnLock()) {
+      logger.info('yarn.lock found -> trying yarn');
+      try {
+        const yarnResult = await this.checkYarn();
+        logger.info('yarn found -> using yarn');
+        return yarnResult;
+      } catch (_err) {
+        logger.info('yarn not found');
+      }
+    } else {
+      logger.info('yarn.lock not found');
+    }
+
+    if (this.hasPNPMLock()) {
+      logger.info('pnpm-lock.yaml found -> trying pnpm');
+      try {
+        let result = await this.checkPNPM();
+        logger.info('pnpm found -> using pnpm');
+        return result;
+      } catch (_err) {
+        logger.info('pnpm not found');
+      }
+    } else {
+      logger.info('pnpm-lock.yaml not found');
     }
+
+    logger.info('using npm');
+    return this.checkNpmVersion();
   }
 
   async run(options) {
-    this.useYarn = options.useYarn;
+    this.packageManager = await this.findPackageManager(options.packageManager);
 
-    let result = await this.findPackageManager();
     let ui = this.ui;
     let startMessage = this.formatStartMessage(options.packages);
     let completeMessage = this.formatCompleteMessage(options.packages);
@@ -165,31 +217,37 @@ class NpmTask extends Task {
     ui.writeLine(prependEmoji('🚧', 'Installing packages... This might take a couple of minutes.'));
     ui.startProgress(chalk.green(startMessage));
 
-    let promise;
-    if (this.useYarn) {
-      this.yarnVersion = result.yarnVersion;
-      let args = this.toYarnArgs(this.command, options);
-      promise = this.yarn(args);
-    } else {
-      let args = this.toNpmArgs(this.command, options);
-      promise = this.npm(args);
-
-      // as of 2018-10-09 npm 5 and 6 _break_ the hierarchy of `node_modules`
-      // after a `npm install foo` (deletes files/folders other than
-      // what was directly installed) in some circumstances, see:
-      //
-      // * https://github.com/npm/npm/issues/16853
-      // * https://github.com/npm/npm/issues/17379
-      //
-      // this ensures that we run a full `npm install` **after** any `npm
-      // install foo` runs to ensure that we have a fully functional
-      // node_modules hierarchy
-      if (result.npmVersion && semver.lt(result.npmVersion, '5.7.1')) {
-        promise = promise.then(() => this.npm(['install']));
+    try {
+      if (this.packageManager.name === 'yarn') {
+        let args = this.toYarnArgs(this.command, options);
+        await this.yarn(args);
+      } else if (this.packageManager.name === 'pnpm') {
+        let args = this.toPNPMArgs(this.command, options);
+        await this.pnpm(args);
+      } else {
+        let args = this.toNpmArgs(this.command, options);
+        await this.npm(args);
+
+        // as of 2018-10-09 npm 5 and 6 _break_ the hierarchy of `node_modules`
+        // after a `npm install foo` (deletes files/folders other than
+        // what was directly installed) in some circumstances, see:
+        //
+        // * https://github.com/npm/npm/issues/16853
+        // * https://github.com/npm/npm/issues/17379
+        //
+        // this ensures that we run a full `npm install` **after** any `npm
+        // install foo` runs to ensure that we have a fully functional
+        // node_modules hierarchy
+        let npmVersion = this.packageManager.version;
+        if (npmVersion && semver.lt(npmVersion, '5.7.1')) {
+          await this.npm(['install']);
+        }
       }
+    } finally {
+      ui.stopProgress();
     }
 
-    return promise.finally(() => ui.stopProgress()).then(() => ui.writeLine(chalk.green(completeMessage)));
+    ui.writeLine(chalk.green(completeMessage));
   }
 
   toNpmArgs(command, options) {
@@ -212,9 +270,9 @@ class NpmTask extends Task {
     }
 
     if (options.verbose) {
-      args.push('--loglevel verbose');
+      args.push('--loglevel', 'verbose');
     } else {
-      args.push('--loglevel error');
+      args.push('--loglevel', 'error');
     }
 
     if (options.packages) {
@@ -262,13 +320,43 @@ class NpmTask extends Task {
     // Yarn v2 defaults to non-interactive
     // with an optional -i flag
 
-    if (semver.lt(this.yarnVersion, '2.0.0')) {
+    if (semver.lt(this.packageManager.version, '2.0.0')) {
       args.push('--non-interactive');
     }
 
     return args;
   }
 
+  toPNPMArgs(command, options) {
+    let args = [];
+
+    if (command === 'install') {
+      if (options.save) {
+        args.push('add');
+      } else if (options['save-dev']) {
+        args.push('add', '--save-dev');
+      } else if (options.packages) {
+        throw new Error(`npm command "${command} ${options.packages.join(' ')}" can not be translated to pnpm command`);
+      } else {
+        args.push('install');
+      }
+
+      if (options['save-exact']) {
+        args.push('--save-exact');
+      }
+    } else if (command === 'uninstall') {
+      args.push('remove');
+    } else {
+      throw new Error(`npm command "${command}" can not be translated to pnpm command`);
+    }
+
+    if (options.packages) {
+      args = args.concat(options.packages);
+    }
+
+    return args;
+  }
+
   formatStartMessage(/* packages */) {
     return '';
   }

package/lib/tasks/npm-uninstall.js

@@ -12,11 +12,11 @@ class NpmUninstallTask extends NpmTask {
   }
 
   formatStartMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'npm'}: Uninstalling ${formatPackageList(packages)} ...`;
+    return `${this.packageManagerOutputName}: Uninstalling ${formatPackageList(packages)} ...`;
   }
 
   formatCompleteMessage(packages) {
-    return `${this.useYarn ? 'Yarn' : 'npm'}: Uninstalled ${formatPackageList(packages)}`;
+    return `${this.packageManagerOutputName}: Uninstalled ${formatPackageList(packages)}`;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "3.28.3",
+  "version": "4.0.0-beta.3",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -125,7 +125,7 @@
     "tree-sync": "^2.1.0",
     "uuid": "^8.3.2",
     "walk-sync": "^2.2.0",
-    "watch-detector": "^1.0.0",
+    "watch-detector": "^1.0.1",
     "workerpool": "^6.1.4",
     "yam": "^1.0.0"
   },