ember-cli 4.4.0 → 4.6.0-beta.1

package/lib/broccoli/ember-addon.js

@@ -3,7 +3,7 @@
 /**
 @module ember-cli
 */
-const defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
+const { defaultsDeep } = require('ember-cli-lodash-subset');
 const Funnel = require('broccoli-funnel');
 const fs = require('fs');
 

package/lib/broccoli/ember-app.js

@@ -24,10 +24,7 @@ const broccoliMergeTrees = require('broccoli-merge-trees');
 const WatchedDir = require('broccoli-source').WatchedDir;
 const UnwatchedDir = require('broccoli-source').UnwatchedDir;
 
-const merge = require('ember-cli-lodash-subset').merge;
-const defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
-const omitBy = require('ember-cli-lodash-subset').omitBy;
-const isNull = require('ember-cli-lodash-subset').isNull;
+const { merge, defaultsDeep, omitBy, isNull } = require('ember-cli-lodash-subset');
 const Funnel = require('broccoli-funnel');
 const logger = require('heimdalljs-logger')('ember-cli:ember-app');
 const addonProcessTree = require('../utilities/addon-process-tree');
@@ -36,6 +33,7 @@ const emberCLIBabelConfigKey = require('../utilities/ember-cli-babel-config-key'
 const { isExperimentEnabled } = require('../experiments');
 const semver = require('semver');
 const DefaultPackager = require('./default-packager');
+const { deprecate } = require('../debug');
 
 let DEFAULT_CONFIG = {
   storeConfigInMeta: true,
@@ -371,6 +369,20 @@ class EmberApp {
     this.options = defaultsDeep(options, detectedDefaultOptions, DEFAULT_CONFIG);
 
     if (this.options.addons.blacklist) {
+      deprecate(
+        'Using the `addons.blacklist` build option is deprecated. Please use `addons.exclude` instead.',
+        false,
+        {
+          for: 'ember-cli',
+          id: 'ember-cli.blacklist-whitelist-build-options',
+          since: {
+            available: '4.4.0',
+            enabled: '4.4.0',
+          },
+          until: '5.0.0',
+        }
+      );
+
       if (this.options.addons.exclude) {
         throw new Error('Specifying both "blacklist" and "exclude" is not supported. Please use only one.');
       }
@@ -388,6 +400,20 @@ class EmberApp {
     });
 
     if (this.options.addons.whitelist) {
+      deprecate(
+        'Using the `addons.whitelist` build option is deprecated. Please use `addons.include` instead.',
+        false,
+        {
+          for: 'ember-cli',
+          id: 'ember-cli.blacklist-whitelist-build-options',
+          since: {
+            available: '4.4.0',
+            enabled: '4.4.0',
+          },
+          until: '5.0.0',
+        }
+      );
+
       if (this.options.addons.include) {
         throw new Error('Specifying both "whitelist" and "include" is not supported. Please use only one.');
       }

package/lib/broccoli/vendor-prefix.js

@@ -6,6 +6,13 @@ window.EmberENV = (function(EmberENV, extra) {
   return EmberENV;
 })(window.EmberENV || {}, {{EMBER_ENV}});
 
+// used to determine if the application should be booted immediately when `app-name.js` is evaluated
+// when `runningTests` the `app-name.js` file will **not** import the applications `app/app.js` and
+// call `Application.create(...)` on it. Additionally, applications can opt-out of this behavior by
+// setting `autoRun` to `false` in their `ember-cli-build.js`
+//
+// The default `test-support.js` file will set this to `true` when it runs (so that Application.create()
+// is not ran when running tests).
 var runningTests = false;
 
 {{content-for 'vendor-prefix'}}

package/lib/cli/cli.js

@@ -151,20 +151,22 @@ class CLI {
 
       let platformCheckerToken = heimdall.start('platform-checker');
 
+      const emberCLIVersion = require('../../package.json').version;
       const PlatformChecker = require('../utilities/platform-checker');
       let platform = new PlatformChecker(process.version);
       let recommendation =
-        ' We recommend that you use the most-recent "Active LTS" version of Node.js.' +
-        ' See https://git.io/v7S5n for details.';
+        ' See "https://github.com/ember-cli/ember-cli/blob/master/docs/node-support.md" to find out which version of Node is best to use.';
 
       if (!this.testing) {
         if (platform.isDeprecated) {
-          this.ui.writeDeprecateLine(`Node ${process.version} is no longer supported by Ember CLI.${recommendation}`);
+          this.ui.writeDeprecateLine(
+            `Node ${process.version} is no longer supported by Ember CLI v${emberCLIVersion}.${recommendation}`
+          );
         }
 
         if (!platform.isTested) {
           this.ui.writeWarnLine(
-            `Node ${process.version} is not tested against Ember CLI on your platform.${recommendation}`
+            `Ember CLI v${emberCLIVersion} is not tested against Node ${process.version}.${recommendation}`
           );
         }
       }

package/lib/cli/index.js

@@ -19,7 +19,7 @@ if (instrumentation.instrumentationEnabled()) {
 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').merge;
+const { merge } = require('ember-cli-lodash-subset');
 const path = require('path');
 const heimdall = require('heimdalljs');
 

package/lib/cli/lookup-command.js

@@ -27,11 +27,15 @@ module.exports = function (commands, commandName, commandArgs, optionHash) {
   // Attempt to find command in ember-cli core commands
   let command = findCommand(commands, commandName);
 
+  let addonWithCommand;
   let addonCommand;
   // Attempt to find command within addons
   if (project && project.eachAddonCommand) {
     project.eachAddonCommand((addonName, commands) => {
       addonCommand = findCommand(commands, commandName);
+      if (addonCommand) {
+        addonWithCommand = addonName;
+      }
       return !addonCommand;
     });
   }
@@ -39,7 +43,7 @@ module.exports = function (commands, commandName, commandArgs, optionHash) {
   if (command && addonCommand) {
     if (addonCommand.overrideCore) {
       ui.writeWarnLine(
-        `An ember-addon has attempted to override the core command "${command.prototype.name}". ` +
+        `An ember-addon (${addonWithCommand}) has attempted to override the core command "${command.prototype.name}". ` +
           `The addon command will be used as the overridding was explicit.`
       );
 
@@ -47,7 +51,7 @@ module.exports = function (commands, commandName, commandArgs, optionHash) {
     }
 
     ui.writeWarnLine(
-      `An ember-addon has attempted to override the core command "${command.prototype.name}". ` +
+      `An ember-addon (${addonWithCommand}) has attempted to override the core command "${command.prototype.name}". ` +
         `The core command will be used.`
     );
     return command;

package/lib/commands/destroy.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const Command = require('../models/command');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
-const merge = require('ember-cli-lodash-subset').merge;
+const { merge } = require('ember-cli-lodash-subset');
 const SilentError = require('silent-error');
 
 module.exports = Command.extend({

package/lib/commands/generate.js

@@ -5,7 +5,7 @@ const chalk = require('chalk');
 const Command = require('../models/command');
 const Blueprint = require('../models/blueprint');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
-const _ = require('ember-cli-lodash-subset');
+const { merge, reject } = require('ember-cli-lodash-subset');
 const EOL = require('os').EOL;
 const SilentError = require('silent-error');
 
@@ -75,7 +75,7 @@ module.exports = Command.extend({
       commandOptions.in = path.resolve(relativePath);
     }
 
-    let taskOptions = _.merge(taskArgs, commandOptions || {});
+    let taskOptions = merge(taskArgs, commandOptions || {});
 
     if (this.project.initializeAddons) {
       this.project.initializeAddons();
@@ -136,7 +136,7 @@ module.exports = Command.extend({
     let blueprints = collection.blueprints;
 
     if (!verbose) {
-      blueprints = _.reject(blueprints, 'overridden');
+      blueprints = reject(blueprints, 'overridden');
     }
 
     let output = '';

package/lib/commands/init.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const clone = require('ember-cli-lodash-subset').clone;
-const merge = require('ember-cli-lodash-subset').merge;
+const { clone, merge } = require('ember-cli-lodash-subset');
 const Command = require('../models/command');
 const SilentError = require('silent-error');
 const chalk = require('chalk');

package/lib/models/addon.js

@@ -27,7 +27,7 @@ const mergeTrees = require('../broccoli/merge-trees');
 const Funnel = require('broccoli-funnel');
 const walkSync = require('walk-sync');
 const ensurePosixPath = require('ensure-posix-path');
-const defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
+const { defaultsDeep } = require('ember-cli-lodash-subset');
 const findAddonByName = require('../utilities/find-addon-by-name');
 const heimdall = require('heimdalljs');
 const calculateCacheKeyForTree = require('calculate-cache-key-for-tree');
@@ -1269,23 +1269,6 @@ let addonProto = {
     });
   },
 
-  /**
-    Returns a tree containing the addon's js files
-
-    @private
-    @deprecated
-    @method addonJsFiles
-    @return {Tree} The filtered addon js files
-  */
-  addonJsFiles(tree) {
-    this._warn(`Addon.prototype.addonJsFiles is deprecated`);
-
-    return new Funnel(tree, {
-      destDir: this.moduleName(),
-      annotation: 'Funnel: Addon JS',
-    });
-  },
-
   /**
     Preprocesses a javascript tree.
 

package/lib/models/blueprint.js

@@ -15,7 +15,7 @@ const inflector = require('inflection');
 const minimatch = require('minimatch');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
-const _ = require('ember-cli-lodash-subset');
+const { merge, zipObject, intersection, cloneDeep, compact, uniq } = require('ember-cli-lodash-subset');
 const walkSync = require('walk-sync');
 const SilentError = require('silent-error');
 const CoreObject = require('core-object');
@@ -723,7 +723,7 @@ let Blueprint = CoreObject.extend({
     };
 
     let customTokens = this.fileMapTokens(options) || options.fileMapTokens || {};
-    return _.merge(standardTokens, customTokens);
+    return merge(standardTokens, customTokens);
   },
 
   /**
@@ -735,10 +735,10 @@ let Blueprint = CoreObject.extend({
   */
   generateFileMap(fileMapVariables) {
     let tokens = this._fileMapTokens(fileMapVariables);
-    let fileMapValues = _.values(tokens);
+    let fileMapValues = Object.values(tokens);
     let tokenValues = fileMapValues.map((token) => token(fileMapVariables));
     let tokenKeys = Object.keys(tokens);
-    return _.zipObject(tokenKeys, tokenValues);
+    return zipObject(tokenKeys, tokenValues);
   },
 
   /**
@@ -807,7 +807,7 @@ let Blueprint = CoreObject.extend({
     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;
+    return (targetFiles && targetFiles.length > 0 && intersection(files, targetFiles)) || files;
   },
 
   /**
@@ -996,7 +996,7 @@ let Blueprint = CoreObject.extend({
         rawArgs: options.rawArgs,
       };
 
-      return _.merge({}, standardLocals, customLocals);
+      return merge({}, standardLocals, customLocals);
     });
   },
 
@@ -1130,7 +1130,11 @@ let Blueprint = CoreObject.extend({
   },
 
   /**
-    Used to add a package to the projects `bower.json`.
+    Used to add a Bower package to the projects `bower.json`.
+    
+    Bower is a package manager that is no longer recommended 
+    for new projects, but you may find this hook used in older
+    addons.
 
     Generally, this would be done from the `afterInstall` hook, to
     ensure that a package that is required by a given blueprint is
@@ -1180,6 +1184,10 @@ let Blueprint = CoreObject.extend({
 
   /**
     Used to add an array of packages to the projects `bower.json`.
+    
+    Bower is a package manager that is no longer recommended 
+    for new projects, but you may find this hook used in older
+    addons.
 
     Generally, this would be done from the `afterInstall` hook, to
     ensure that a package that is required by a given blueprint is
@@ -1402,7 +1410,7 @@ let Blueprint = CoreObject.extend({
     this._printableProperties.forEach((key) => {
       let value = this[key];
       if (key === 'availableOptions') {
-        value = _.cloneDeep(value);
+        value = cloneDeep(value);
         value.forEach((option) => {
           if (typeof option.type === 'function') {
             option.type = option.type.name;
@@ -1540,7 +1548,7 @@ Blueprint.list = function (options) {
       let blueprint = Blueprint.load(blueprintPath);
       if (blueprint) {
         let name = blueprint.name;
-        blueprint.overridden = _.includes(seen, name);
+        blueprint.overridden = seen.includes(name);
         seen.push(name);
 
         return blueprint;
@@ -1549,7 +1557,7 @@ Blueprint.list = function (options) {
 
     return {
       source,
-      blueprints: _.compact(blueprints),
+      blueprints: compact(blueprints),
     };
   });
 };
@@ -1668,7 +1676,7 @@ function isIgnored(info) {
 function generateLookupPaths(lookupPaths) {
   lookupPaths = lookupPaths || [];
   lookupPaths = lookupPaths.concat(Blueprint.defaultLookupPaths());
-  return _.uniq(lookupPaths);
+  return uniq(lookupPaths);
 }
 
 /**

package/lib/models/command.js

@@ -7,7 +7,7 @@ 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 _ = require('ember-cli-lodash-subset');
+const { union, defaults, uniq, uniqBy, reject } = require('ember-cli-lodash-subset');
 const EOL = require('os').EOL;
 const CoreObject = require('core-object');
 const logger = require('heimdalljs-logger')('ember-cli:command');
@@ -163,12 +163,12 @@ let Command = CoreObject.extend({
     let extendedAvailableOptions = (options && options.availableOptions) || [];
     let extendedAnonymousOptions = (options && options.anonymousOptions) || [];
 
-    this.anonymousOptions = _.union(this.anonymousOptions.slice(0), extendedAnonymousOptions);
+    this.anonymousOptions = union(this.anonymousOptions.slice(0), extendedAnonymousOptions);
 
     // merge any availableOptions
-    this.availableOptions = _.union(this.availableOptions.slice(0), extendedAvailableOptions);
+    this.availableOptions = union(this.availableOptions.slice(0), extendedAvailableOptions);
 
-    let optionKeys = _.uniq(_.map(this.availableOptions, 'name'));
+    let optionKeys = uniq(this.availableOptions.map((option) => option.name));
 
     optionKeys.map(this.mergeDuplicateOption.bind(this));
 
@@ -345,23 +345,17 @@ let Command = CoreObject.extend({
   mergeDuplicateOption(key) {
     let duplicateOptions, mergedOption, mergedAliases;
     // get duplicates to merge
-    duplicateOptions = _.filter(this.availableOptions, { name: key });
+    duplicateOptions = this.availableOptions.filter((option) => option.name === key);
 
     if (duplicateOptions.length > 1) {
       // TODO: warn on duplicates and overwriting
-      mergedAliases = [];
-
-      _.map(duplicateOptions, 'aliases').map((alias) => {
-        alias.map((a) => {
-          mergedAliases.push(a);
-        });
-      });
+      mergedAliases = duplicateOptions.flatMap((option) => option.aliases);
 
       // merge duplicate options
       mergedOption = Object.assign.apply(null, duplicateOptions);
 
       // replace aliases with unique aliases
-      mergedOption.aliases = _.uniqBy(mergedAliases, (alias) => {
+      mergedOption.aliases = uniqBy(mergedAliases, (alias) => {
         if (typeof alias === 'object') {
           return alias[Object.keys(alias)[0]];
         }
@@ -369,9 +363,10 @@ let Command = CoreObject.extend({
       });
 
       // remove duplicates from options
-      this.availableOptions = _.reject(this.availableOptions, { name: key });
+      this.availableOptions = reject(this.availableOptions, { name: key });
       this.availableOptions.push(mergedOption);
     }
+
     return this.availableOptions;
   },
 
@@ -589,7 +584,7 @@ let Command = CoreObject.extend({
     Object.keys(parsedOptions).map(validateParsed.bind(this));
 
     return {
-      options: _.defaults(commandOptions, this.settings),
+      options: defaults(commandOptions, this.settings),
       args: parsedOptions.argv.remain,
     };
   },

package/lib/models/project.js

@@ -8,7 +8,7 @@ const path = require('path');
 const findup = require('find-up');
 const resolve = util.promisify(require('resolve'));
 const fs = require('fs-extra');
-const _ = require('ember-cli-lodash-subset');
+const { cloneDeep, merge, forOwn } = require('ember-cli-lodash-subset');
 const logger = require('heimdalljs-logger')('ember-cli:project');
 const versionUtils = require('../utilities/version-utils');
 const emberCLIVersion = versionUtils.emberCLIVersion;
@@ -267,7 +267,7 @@ class Project {
       config = this.configWithoutCache(_env);
       this.configCache.set(key, config);
     }
-    return _.cloneDeep(config);
+    return cloneDeep(config);
   }
 
   /**
@@ -283,7 +283,7 @@ class Project {
       let appConfig = this.require(configPath)(env);
       let addonsConfig = this.getAddonsConfig(env, appConfig);
 
-      return _.merge(addonsConfig, appConfig);
+      return merge(addonsConfig, appConfig);
     } else {
       return this.getAddonsConfig(env, {});
     }
@@ -311,7 +311,7 @@ class Project {
     if (fs.existsSync(`${targetsPath}.js`)) {
       this._targets = this.require(targetsPath);
     } else {
-      this._targets = require('../utilities/default-targets');
+      this._targets = require('../../blueprints/app/files/config/targets');
     }
     return this._targets;
   }
@@ -328,11 +328,11 @@ class Project {
   getAddonsConfig(env, appConfig) {
     this.initializeAddons();
 
-    let initialConfig = _.merge({}, appConfig);
+    let initialConfig = merge({}, appConfig);
 
     return this.addons.reduce((config, addon) => {
       if (addon.config) {
-        _.merge(config, addon.config(env, config));
+        merge(config, addon.config(env, config));
       }
 
       return config;
@@ -474,9 +474,9 @@ class Project {
    */
   discoverAddons() {
     if (this._didDiscoverAddons) {
-      this._didDiscoverAddons = true;
       return;
     }
+    this._didDiscoverAddons = true;
 
     let addonPackageList = this._packageInfo.discoverProjectAddons();
     this.addonPackages = this._packageInfo.generateAddonPackages(addonPackageList);
@@ -565,7 +565,7 @@ class Project {
       this.initializeAddons();
       let addonCommands = this.addonCommands();
 
-      _.forOwn(addonCommands, (commands, addonName) => callback(addonName, commands));
+      forOwn(addonCommands, (commands, addonName) => callback(addonName, commands));
     }
   }
 

package/lib/tasks/addon-install.js

@@ -2,7 +2,7 @@
 
 const Task = require('../models/task');
 const SilentError = require('silent-error');
-const merge = require('ember-cli-lodash-subset').merge;
+const { merge } = require('ember-cli-lodash-subset');
 const getPackageBaseName = require('../utilities/get-package-base-name');
 
 class AddonInstallTask extends Task {

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

@@ -4,33 +4,9 @@
 // this directory.
 
 const fs = require('fs-extra');
-const path = require('path');
 const Task = require('../models/task');
 const SilentError = require('silent-error');
-
-// used in order to infer the directory to use, if `--directory` was specified
-// to `ember new`/`ember addon` it will **always** be used directly (without
-// modification)
-function chooseDirectoryName(projectName) {
-  let isScoped = projectName[0] === '@' && projectName.includes('/');
-
-  if (isScoped) {
-    let slashIndex = projectName.indexOf('/');
-    let scopeName = projectName.substring(1, slashIndex);
-    let packageNameWithoutScope = projectName.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 projectName;
-  }
-}
+const directoryForPackageName = require('../utilities/directory-for-package-name');
 
 class CreateTask extends Task {
   // Options: String directoryName, Boolean: dryRun
@@ -41,7 +17,7 @@ class CreateTask extends Task {
   }
 
   async run(options) {
-    let directoryName = options.directoryName ? options.directoryName : chooseDirectoryName(options.projectName);
+    let directoryName = options.directoryName ? options.directoryName : directoryForPackageName(options.projectName);
 
     if (options.dryRun) {
       if (fs.existsSync(directoryName) && fs.readdirSync(directoryName).length) {

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

@@ -3,7 +3,7 @@
 const Blueprint = require('../models/blueprint');
 const Task = require('../models/task');
 const parseOptions = require('../utilities/parse-options');
-const merge = require('ember-cli-lodash-subset').merge;
+const { merge } = require('ember-cli-lodash-subset');
 const logger = require('heimdalljs-logger')('ember-cli:generate-from-blueprint');
 const lintFix = require('../utilities/lint-fix');
 

package/lib/tasks/install-blueprint.js

@@ -6,7 +6,7 @@ const Task = require('../models/task');
 const util = require('util');
 const temp = require('temp');
 const path = require('path');
-const merge = require('ember-cli-lodash-subset').merge;
+const { merge } = require('ember-cli-lodash-subset');
 const execa = require('../utilities/execa');
 const SilentError = require('silent-error');
 const npa = require('npm-package-arg');

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

@@ -4,7 +4,7 @@ const path = require('path');
 const EventEmitter = require('events').EventEmitter;
 const chalk = require('chalk');
 const fs = require('fs');
-const debounce = require('ember-cli-lodash-subset').debounce;
+const { debounce } = require('ember-cli-lodash-subset');
 const mapSeries = require('promise-map-series');
 const Task = require('../../models/task');
 const SilentError = require('silent-error');

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

@@ -133,7 +133,7 @@ module.exports = class LiveReloadServer {
 
     // this is required to prevent tiny-lr from triggering an error
     // when checking this.server._handle during its close handler
-    // here: https://git.io/fA7Tr
+    // here: https://github.com/mklabs/tiny-lr/blob/d68d983eaf80b5bae78b2dba259a1ad5e3b03a63/lib/server.js#L209
     lrServer.server = this.httpServer;
 
     return lrServer;

package/lib/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;
+  }
+};