ember-cli 4.12.0-beta.0 → 4.13.0-beta.0

package/lib/tasks/bower-install.js

@@ -1,175 +0,0 @@
-'use strict';
-
-// Runs `bower install` in cwd
-const fs = require('fs-extra');
-const path = require('path');
-const execa = require('../utilities/execa');
-const util = require('util');
-const SilentError = require('silent-error');
-const Task = require('../models/task');
-const formatPackageList = require('../utilities/format-package-list');
-
-const logger = require('heimdalljs-logger')('ember-cli:tasks:bower-install');
-
-const resolve = util.promisify(require('resolve'));
-
-const cliPath = path.resolve(`${__dirname}/../..`);
-
-class BowerInstallTask extends Task {
-  resolveBower() {
-    logger.info('Resolving "bower" from %s ...', cliPath);
-    return resolve('bower', { basedir: cliPath });
-  }
-
-  importBower(path) {
-    logger.info('Importing "bower" from: %s', path);
-    this.bower = require(path);
-  }
-
-  ensureBower() {
-    if (this.bower) {
-      return Promise.resolve();
-    }
-
-    return this.resolveBower()
-      .catch((error) => {
-        if (error.message.indexOf("Cannot find module 'bower'") === -1) {
-          throw error;
-        }
-
-        return this.installBower().then(() => this.resolveBower());
-      })
-      .then((bowerPath) => this.importBower(bowerPath));
-  }
-
-  installBower() {
-    logger.info('Installing "bower" via npm into: %s', cliPath);
-
-    let ui = this.ui;
-    const chalk = require('chalk');
-
-    ui.startProgress(chalk.green('npm: Installing bower ...'));
-
-    return execa('npm', ['install', 'bower@^1.3.12'], { cwd: cliPath })
-      .finally(() => ui.stopProgress())
-      .catch((error) => this.handleInstallBowerError(error))
-      .then(() => ui.writeLine(chalk.green('npm: Installed bower')));
-  }
-
-  handleInstallBowerError(error) {
-    if (error.message.indexOf("Cannot read property 'target' of null") !== -1) {
-      throw new SilentError(
-        'Bower could not be installed due to a bug in your npm installation.\n' +
-          'Please update your npm version by running: npm install -g npm'
-      );
-    }
-
-    throw error;
-  }
-
-  get bowerJsonPath() {
-    return path.join(this.project.root, 'bower.json');
-  }
-
-  hasBowerJson() {
-    return fs.existsSync(this.bowerJsonPath);
-  }
-
-  hasBowerDependencies() {
-    if (!this.hasBowerJson()) {
-      return false;
-    }
-
-    let json = fs.readJsonSync(this.bowerJsonPath);
-    let deps = Object.keys(json.dependencies || {});
-    let devDeps = Object.keys(json.devDependencies || {});
-    return deps.length || devDeps.length;
-  }
-
-  ensureBowerJson() {
-    if (this.hasBowerJson()) {
-      return Promise.resolve();
-    }
-
-    let projectName = this.project.name();
-    let bowerJsonPath = this.bowerJsonPath;
-
-    logger.info('Creating "bower.json" for: %s at: %s', projectName, bowerJsonPath);
-
-    return fs.writeJson(bowerJsonPath, { name: projectName }, { spaces: 2 });
-  }
-
-  // Options: Boolean verbose
-  run(options) {
-    let ui = this.ui;
-
-    let packages = options.packages || [];
-    let installOptions = options.installOptions || {};
-    let savePackages = installOptions.save || installOptions.saveDev;
-
-    // if we are running "bower install" from "ember init" and there is
-    // no "bower.json" we return early
-    if (!savePackages && !this.hasBowerDependencies()) {
-      logger.info('Skipping "bower install" since "bower.json" does not exist or is empty');
-      return Promise.resolve();
-    }
-
-    // resolve "bower" and install via npm if necessary
-    // -> then check if a "bower.json" file exists and create if necessary
-    // -> then run the actual "bower install"
-    return this.ensureBower()
-      .then(() => this.ensureBowerJson())
-      .then(() => {
-        const chalk = require('chalk');
-        let bowerConfig = this.bowerConfig || require('bower-config');
-
-        let startMessage = this.formatStartMessage(packages);
-        let completeMessage = this.formatCompleteMessage(packages);
-
-        logger.info('Installing %j via Bower with options: %j', packages, installOptions);
-
-        ui.startProgress(chalk.green(startMessage));
-
-        let config = bowerConfig.read();
-        config.interactive = true;
-
-        return new Promise((resolve, reject) => {
-          this.bower.commands
-            .install(packages, installOptions, config) // Packages, options, config
-            .on('log', logBowerMessage)
-            .on('prompt', ui.prompt.bind(ui))
-            .on('error', reject)
-            .on('end', resolve);
-        })
-          .finally(() => ui.stopProgress())
-          .then(() => ui.writeLine(chalk.green(completeMessage)));
-
-        function logBowerMessage(message) {
-          if (message.level === 'conflict') {
-            // e.g.
-            //   conflict Unable to find suitable version for ember-data
-            //     1) ember-data 1.0.0-beta.6
-            //     2) ember-data ~1.0.0-beta.7
-            ui.writeLine(`  ${chalk.red('conflict')} ${message.message}`);
-            message.data.picks.forEach((pick, index) => {
-              ui.writeLine(`    ${chalk.green(`${index + 1})`)} ${message.data.name} ${pick.endpoint.target}`);
-            });
-          } else if (message.level === 'info' && options.verbose) {
-            // e.g.
-            //   cached git://example.com/some-package.git#1.0.0
-            ui.writeLine(`  ${chalk.green(message.id)} ${message.message}`);
-          }
-        }
-      });
-  }
-
-  formatStartMessage(packages) {
-    return `Bower: Installing ${formatPackageList(packages)} ...`;
-  }
-
-  formatCompleteMessage(packages) {
-    return `Bower: Installed ${formatPackageList(packages)}`;
-  }
-}
-
-module.exports = BowerInstallTask;

package/lib/utilities/ember-cli-babel-config-key.js

@@ -1,12 +0,0 @@
-'use strict';
-
-module.exports = function emberCLIBabelConfigKey(emberCLIBabelInstance) {
-  // future versions of ember-cli-babel will be moving the location for its
-  // own configuration options out of `babel` and will be issuing a deprecation
-  // if used in the older way
-  //
-  // see: https://github.com/babel/ember-cli-babel/pull/105
-  let emberCLIBabelConfigKey = (emberCLIBabelInstance && emberCLIBabelInstance.configKey) || 'babel';
-
-  return emberCLIBabelConfigKey;
-};

package/lib/utilities/find-addon-by-name.js

@@ -1,39 +0,0 @@
-'use strict';
-
-let HAS_FOUND_ADDON_BY_NAME = Object.create(null);
-
-/*
-  Finds an addon given a specific name.
-
-  The `name` value in an addon's `package.json` file takes priority over the
-  `name` value in an addon's `index.js` file.
-*/
-module.exports = function findAddonByName(addons, name) {
-  let exactMatchFromPkg = addons.find((addon) => addon.pkg && addon.pkg.name === name);
-
-  if (exactMatchFromPkg) {
-    return exactMatchFromPkg;
-  }
-
-  let exactMatchFromIndex = addons.find((addon) => addon.name === name);
-  if (exactMatchFromIndex) {
-    let pkg = exactMatchFromIndex.pkg;
-
-    if (HAS_FOUND_ADDON_BY_NAME[name] !== true) {
-      HAS_FOUND_ADDON_BY_NAME[name] = true;
-      console.warn(
-        `The addon at \`${exactMatchFromIndex.root}\` has different values in its addon index.js ('${
-          exactMatchFromIndex.name
-        }') and its package.json ('${pkg && pkg.name}').`
-      );
-    }
-
-    return exactMatchFromIndex;
-  }
-
-  return null;
-};
-
-module.exports._clearCaches = function () {
-  HAS_FOUND_ADDON_BY_NAME = Object.create(null);
-};