ember-cli 3.4.4 → 3.5.1

package/lib/broccoli/ember-app.js

@@ -26,6 +26,7 @@ const ConfigReplace = require('broccoli-config-replace');
 const mergeTrees = require('./merge-trees');
 const WatchedDir = require('broccoli-source').WatchedDir;
 const UnwatchedDir = require('broccoli-source').UnwatchedDir;
+const BroccoliMergeTrees = require('broccoli-merge-trees');
 
 const merge = require('ember-cli-lodash-subset').merge;
 const defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
@@ -37,7 +38,7 @@ const emberAppUtils = require('../utilities/ember-app-utils');
 const addonProcessTree = require('../utilities/addon-process-tree');
 const lintAddonsByType = require('../utilities/lint-addons-by-type');
 const emberCLIBabelConfigKey = require('../utilities/ember-cli-babel-config-key');
-const experiments = require('../experiments');
+const { isExperimentEnabled } = require('../experiments');
 const semver = require('semver');
 const DefaultPackager = require('./default-packager');
 
@@ -166,7 +167,7 @@ class EmberApp {
       additionalAssetPaths: this.otherAssetPaths,
       vendorTestStaticStyles: this.vendorTestStaticStyles,
       legacyTestFilesToAppend: this.legacyTestFilesToAppend,
-      isModuleUnificationEnabled: experiments.MODULE_UNIFICATION && !!this.trees.src,
+      isModuleUnificationEnabled: isExperimentEnabled('MODULE_UNIFICATION') && !!this.trees.src,
       distPaths: {
         appJsFile: this.options.outputPaths.app.js,
         appCssFile: this.options.outputPaths.app.css,
@@ -179,6 +180,7 @@ class EmberApp {
       },
     });
 
+    this._isPackageHookSupplied = typeof this.options.package === 'function';
     this._cachedAddonBundles = {};
   }
 
@@ -263,7 +265,7 @@ class EmberApp {
     // these are contained within app/ no need to watch again
     // (we should probably have the builder or the watcher dedup though)
 
-    if (experiments.MODULE_UNIFICATION) {
+    if (isExperimentEnabled('MODULE_UNIFICATION')) {
       let srcStylesPath = `${resolvePathFor('src', trees.src)}/ui/styles`;
       this._stylesPath = fs.existsSync(srcStylesPath) ? srcStylesPath : resolvePathFor('app/styles', trees.styles);
     } else {
@@ -967,7 +969,7 @@ class EmberApp {
       addons: this.project.addons,
       autoRun: this.options.autoRun,
       storeConfigInMeta: this.options.storeConfigInMeta,
-      isModuleUnification: experiments.MODULE_UNIFICATION && !!this.trees.src,
+      isModuleUnification: isExperimentEnabled('MODULE_UNIFICATION') && !!this.trees.src,
     });
 
     return new ConfigReplace(index, this._defaultPackager.packageConfig(this.tests), {
@@ -1028,7 +1030,7 @@ class EmberApp {
       annotation: 'ProcessedAppTree',
     });
 
-    if (experiments.PACKAGER && isPackageHookSupplied) {
+    if (isExperimentEnabled('PACKAGER') && isPackageHookSupplied) {
       appTree = this._precompileAppJsTree(appTree);
     }
 
@@ -1161,7 +1163,7 @@ class EmberApp {
       for (let addonBundle of addonBundles) {
         let { name, root } = addonBundle;
 
-        if (experiments.DELAYED_TRANSPILATION) {
+        if (isExperimentEnabled('DELAYED_TRANSPILATION')) {
           if (!options.moduleNormalizerDisabled) {
             // move legacy /modules/addon to /addon
             let hasAlreadyPrintedModuleDeprecation;
@@ -1392,7 +1394,7 @@ class EmberApp {
       lintTrees.push(lintedApp);
     }
 
-    if (experiments.MODULE_UNIFICATION && this.trees.src) {
+    if (isExperimentEnabled('MODULE_UNIFICATION') && this.trees.src) {
       let lintedSrc = this.addonLintTree('src', this.trees.src);
       lintedSrc = new Funnel(lintedSrc, {
         destDir: 'lint/src/',
@@ -1611,33 +1613,15 @@ class EmberApp {
     @return {Array} An array of trees
    */
   toArray() {
-    // allows us to optimize if they aren't using the hook
-    let isPackageHookSupplied = typeof this.package === 'function';
-
-    let trees = [
+    return [
       this.getAddonTemplates(),
       this.getStyles(),
       this.getTests(),
       this.getExternalTree(),
       this.getPublic(),
       this.getSrc(),
-      this.getAppJavascript(isPackageHookSupplied),
+      this.getAppJavascript(this._isPackageHookSupplied),
     ].filter(Boolean);
-
-    let fullTree = mergeTrees(trees, {
-      overwrite: true,
-      annotation: 'Full Application',
-    });
-
-    if (experiments.PACKAGER) {
-      if (isPackageHookSupplied) {
-        return [this.package.call(this, fullTree)];
-      } else {
-        this.project.ui.writeWarnLine('`package` hook must be a function, falling back to default packaging.');
-      }
-    }
-
-    return this._legacyPackager(fullTree);
   }
 
   _legacyAddonCompile(type, outputDir, _options) {
@@ -1705,8 +1689,8 @@ class EmberApp {
     });
   }
 
-  _legacyPackager(fullTree) {
-    if (experiments.DELAYED_TRANSPILATION) {
+  _legacyPackage(fullTree) {
+    if (isExperimentEnabled('DELAYED_TRANSPILATION')) {
       fullTree = mergeTrees(
         [
           fullTree,
@@ -1723,6 +1707,8 @@ class EmberApp {
           overwrite: true,
         }
       );
+
+      fullTree = this._debugTree(fullTree, 'postcompiledAddonTrees');
     }
 
     let javascriptTree = this._defaultPackager.packageJavascript(fullTree);
@@ -1743,7 +1729,10 @@ class EmberApp {
       sourceTrees.push(this._defaultPackager.packageTests(fullTree));
     }
 
-    return sourceTrees;
+    return mergeTrees(sourceTrees, {
+      overwrite: true,
+      annotation: 'Application Dist',
+    });
   }
 
   /**
@@ -1751,16 +1740,36 @@ class EmberApp {
 
     @public
     @method toTree
-    @param  {Array} additionalTrees Array of additional trees to merge
+    @param  {Array} [additionalTrees] Array of additional trees to merge
     @return {Tree}                  Merged tree for this application
    */
   toTree(additionalTrees) {
-    let tree = mergeTrees(this.toArray().concat(additionalTrees || []), {
+    let packagedTree;
+    let packageFn = this.options.package;
+
+    let fullTree = mergeTrees(this.toArray(), {
       overwrite: true,
-      annotation: 'TreeMerger (allTrees)',
+      annotation: 'Full Application',
     });
 
-    return this.addonPostprocessTree('all', tree);
+    fullTree = this._debugTree(fullTree, 'prepackage');
+
+    if (isExperimentEnabled('PACKAGER')) {
+      if (this._isPackageHookSupplied) {
+        packagedTree = packageFn.call(this, fullTree);
+      } else {
+        this.project.ui.writeWarnLine('`package` hook must be a function, falling back to default packaging.');
+      }
+    }
+
+    if (!packagedTree) {
+      packagedTree = this._legacyPackage(fullTree);
+    }
+
+    let trees = [].concat(packagedTree, additionalTrees).filter(Boolean);
+    let combinedPackageTree = new BroccoliMergeTrees(trees);
+
+    return this.addonPostprocessTree('all', combinedPackageTree);
   }
 }
 

package/lib/commands/destroy.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const path = require('path');
 const Command = require('../models/command');
 const Promise = require('rsvp').Promise;
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
@@ -19,6 +20,8 @@ module.exports = Command.extend({
     { name: 'classic',       type: Boolean, default: false, aliases: ['c'] },
     { name: 'dummy',         type: Boolean, default: false, aliases: ['dum', 'id'] },
     { name: 'in-repo-addon', type: String,  default: null,  aliases: ['in-repo', 'ir'] },
+    { name: 'in',            type: String,  default: null, description: 'Runs a blueprint against an in repo addon. ' +
+                                                                        'A path is expected, relative to the root of the project.' },
   ],
 
   anonymousOptions: [
@@ -51,6 +54,11 @@ module.exports = Command.extend({
       commandOptions.pod = !commandOptions.pod;
     }
 
+    if (commandOptions.in) {
+      let relativePath = path.relative(this.project.root, commandOptions.in);
+      commandOptions.in = path.resolve(relativePath);
+    }
+
     let taskOptions = merge(taskArgs, commandOptions || {});
 
     if (this.project.initializeAddons) {

package/lib/commands/generate.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const path = require('path');
 const chalk = require('chalk');
 const Command = require('../models/command');
 const Promise = require('rsvp').Promise;
@@ -22,6 +23,8 @@ module.exports = Command.extend({
     { name: 'classic',       type: Boolean, default: false, aliases: ['c'] },
     { name: 'dummy',         type: Boolean, default: false, aliases: ['dum', 'id'] },
     { name: 'in-repo-addon', type: String,  default: null,  aliases: ['in-repo', 'ir'] },
+    { name: 'in',            type: String,  default: null, description: 'Runs a blueprint against an in repo addon. ' +
+                                                                        'A path is expected, relative to the root of the project.' },
   ],
 
   anonymousOptions: [
@@ -55,6 +58,11 @@ module.exports = Command.extend({
       }
     }
 
+    if (commandOptions.in) {
+      let relativePath = path.relative(this.project.root, commandOptions.in);
+      commandOptions.in = path.resolve(relativePath);
+    }
+
     let taskOptions = _.merge(taskArgs, commandOptions || {});
 
     if (this.project.initializeAddons) {

package/lib/commands/new.js

@@ -9,7 +9,7 @@ const SilentError = require('silent-error');
 const validProjectName = require('../utilities/valid-project-name');
 const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
-const experiments = require('../experiments');
+const { isExperimentEnabled } = require('../experiments');
 
 const rmdir = RSVP.denodeify(fs.remove);
 const Promise = RSVP.Promise;
@@ -38,7 +38,7 @@ module.exports = Command.extend({
   beforeRun: mergeBlueprintOptions,
 
   run(commandOptions, rawArgs) {
-    if (experiments.MODULE_UNIFICATION) {
+    if (isExperimentEnabled('MODULE_UNIFICATION')) {
       if (commandOptions.blueprint === 'app') {
         commandOptions.blueprint = 'module-unification-app';
       } else if (commandOptions.blueprint === 'addon') {

package/lib/commands/serve.js

@@ -23,6 +23,8 @@ module.exports = Command.extend({
     { name: 'port',                 type: Number,  default: defaultPort,   aliases: ['p'],                                                     description: `To use a port different than ${defaultPort}. Pass 0 to automatically pick an available port.` },
     { name: 'host',                 type: String,                          aliases: ['H'],                                                     description: 'Listens on all interfaces by default' },
     { name: 'proxy',                type: String,                          aliases: ['pr', 'pxy'] },
+    { name: 'proxy-in-timeout',     type: Number,  default: 120000,        aliases: ['pit'],                                                   description: 'When using --proxy: timeout (in ms) for incoming requests' },
+    { name: 'proxy-out-timeout',    type: Number,  default: 0,             aliases: ['pot'],                                                   description: 'When using --proxy: timeout (in ms) for outgoing requests' },
     { name: 'secure-proxy',         type: Boolean, default: true,          aliases: ['spr'],                                                   description: 'Set to false to proxy self-signed SSL certificates' },
     { name: 'transparent-proxy',    type: Boolean, default: true,          aliases: ['transp'],                                                description: 'Set to false to omit x-forwarded-* headers when proxying' },
     { name: 'watcher',              type: String,  default: 'events',      aliases: ['w'] },

package/lib/errors/cli.js

@@ -0,0 +1,4 @@
+
+'use strict';
+
+module.exports = class BuildError extends Error {};

package/lib/experiments/index.js

@@ -1,25 +1,46 @@
 'use strict';
 
-// eslint-disable-next-line no-unused
+const CliError = require('../errors/cli');
+
+const availableExperiments = Object.freeze([
+  'PACKAGER',
+  'MODULE_UNIFICATION',
+  'DELAYED_TRANSPILATION',
+  'BROCCOLI_2',
+  'SYSTEM_TEMP',
+]);
+
+const enabledExperiments = Object.freeze([
+  'BROCCOLI_2',
+]);
+
 function isExperimentEnabled(experimentName) {
+  if (!availableExperiments.includes(experimentName)) {
+    return false;
+  }
+
   if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS) {
     return true;
   }
 
   let experimentEnvironmentVariable = `EMBER_CLI_${experimentName}`;
-  if (process.env[experimentEnvironmentVariable]) {
+  let experimentValue = process.env[experimentEnvironmentVariable];
+  if (enabledExperiments.includes(experimentName)) {
+    return experimentValue !== 'false';
+  } else if (
+    experimentName === 'SYSTEM_TEMP' &&
+    experimentValue === undefined &&
+    isExperimentEnabled('BROCCOLI_2')
+  ) {
     return true;
+  } else {
+    return experimentValue !== undefined && experimentValue !== 'false';
   }
-
-  return false;
 }
 
-let experiments = {
-  PACKAGER: isExperimentEnabled('PACKAGER'),
-  MODULE_UNIFICATION: isExperimentEnabled('MODULE_UNIFICATION'),
-  DELAYED_TRANSPILATION: isExperimentEnabled('DELAYED_TRANSPILATION'),
-};
-
-Object.freeze(experiments);
+// SYSTEM_TEMP can only be used with BROCCOLI_2
+if (isExperimentEnabled('SYSTEM_TEMP') && !isExperimentEnabled('BROCCOLI_2')) {
+  throw new CliError('EMBER_CLI_SYSTEM_TEMP only works in combination with EMBER_CLI_BROCCOLI_2');
+}
 
-module.exports = experiments;
+module.exports = { isExperimentEnabled };

package/lib/models/addon-info.js

@@ -1,10 +1,10 @@
 'use strict';
 
 /**
- * @module addon-info
- *
  * A simple class to store metadata info about an addon. This replaces a plain JS object
  * that used to be created with the same fields.
+ *
+ * @module ember-cli
  */
 
 class AddonInfo {

package/lib/models/addon.js

@@ -11,7 +11,7 @@ const heimdallLogger = require('heimdalljs-logger');
 const logger = heimdallLogger('ember-cli:addon');
 const treeCacheLogger = heimdallLogger('ember-cli:addon:tree-cache');
 const cacheKeyLogger = heimdallLogger('ember-cli:addon:cache-key-for-tree');
-const experiments = require('../experiments');
+const { isExperimentEnabled } = require('../experiments');
 const PackageInfoCache = require('../models/package-info-cache');
 
 const p = require('ember-cli-preprocess-registry/preprocessors');
@@ -242,7 +242,7 @@ let addonProto = {
 
     this._initDefaultBabelOptions();
 
-    if (experiments.DELAYED_TRANSPILATION) {
+    if (isExperimentEnabled('DELAYED_TRANSPILATION')) {
       this.registry.remove('template', 'ember-cli-htmlbars');
     }
   },
@@ -253,7 +253,7 @@ let addonProto = {
     });
 
     let defaultEmberCLIBabelOptions;
-    if (experiments.DELAYED_TRANSPILATION) {
+    if (isExperimentEnabled('DELAYED_TRANSPILATION')) {
       defaultEmberCLIBabelOptions = {
         compileModules: false,
         disablePresetEnv: true,
@@ -400,11 +400,10 @@ let addonProto = {
     let pkgInfo = this.packageInfoCache.getEntry(this.root);
 
     if (pkgInfo) {
-      let self = this;
       let addonPackageList = pkgInfo.discoverAddonAddons();
       this.addonPackages =
           pkgInfo.generateAddonPackages(addonPackageList,
-            addonInfo => (self.shouldIncludeChildAddon && !self.shouldIncludeChildAddon(addonInfo)));
+            addonInfo => (this.shouldIncludeChildAddon && !this.shouldIncludeChildAddon(addonInfo)));
 
       // in case any child addons are invalid, dump to the console about them.
       pkgInfo.dumpInvalidAddonPackages(addonPackageList);
@@ -747,7 +746,7 @@ let addonProto = {
     @return {Tree} App file tree
   */
   treeForApp(tree) {
-    if (!experiments.MODULE_UNIFICATION) {
+    if (!isExperimentEnabled('MODULE_UNIFICATION')) {
       return tree;
     } else if (this.project.isModuleUnification() && this.isModuleUnification()) {
       return null;
@@ -788,7 +787,7 @@ let addonProto = {
     @return
   */
   treeForSrc(rawSrcTree) {
-    if (!experiments.MODULE_UNIFICATION) {
+    if (!isExperimentEnabled('MODULE_UNIFICATION')) {
       return null;
     }
     if (!rawSrcTree) { return null; }
@@ -801,7 +800,7 @@ let addonProto = {
     let srcAfterPreprocessTreeHook = this._addonPreprocessTree('src', srcNamespacedTree);
 
     let srcAfterTemplatePreprocessing = srcAfterPreprocessTreeHook;
-    if (!experiments.DELAYED_TRANSPILATION || registryHasPreprocessor(this.registry, 'template')) {
+    if (!isExperimentEnabled('DELAYED_TRANSPILATION') || registryHasPreprocessor(this.registry, 'template')) {
       srcAfterTemplatePreprocessing = preprocessTemplates(srcAfterPreprocessTreeHook, {
         registry: this.registry,
         annotation: `Addon#treeForSrc(${this.name})`,
@@ -1132,7 +1131,7 @@ let addonProto = {
     this._requireBuildPackages();
 
     if (this.shouldCompileTemplates()) {
-      if (!experiments.DELAYED_TRANSPILATION && !registryHasPreprocessor(this.registry, 'template')) {
+      if (!isExperimentEnabled('DELAYED_TRANSPILATION') && !registryHasPreprocessor(this.registry, 'template')) {
         throw new SilentError(`Addon templates were detected, but there are no template compilers registered for \`${this.name}\`. ` +
           `Please make sure your template precompiler (commonly \`ember-cli-htmlbars\`) is listed in \`dependencies\` ` +
           `(NOT \`devDependencies\`) in \`${this.name}\`'s \`package.json\`.`);
@@ -1141,7 +1140,7 @@ let addonProto = {
       let preprocessedTemplateTree = this._addonPreprocessTree('template', this._addonTemplateFiles(addonTree));
 
       let processedTemplateTree;
-      if (!experiments.DELAYED_TRANSPILATION || registryHasPreprocessor(this.registry, 'template')) {
+      if (!isExperimentEnabled('DELAYED_TRANSPILATION') || registryHasPreprocessor(this.registry, 'template')) {
         processedTemplateTree = preprocessTemplates(preprocessedTemplateTree, {
           annotation: `compileTemplates(${this.name})`,
           registry: this.registry,

package/lib/models/blueprint.js

@@ -24,6 +24,7 @@ const EOL = require('os').EOL;
 const bowEpParser = require('bower-endpoint-parser');
 const logger = require('heimdalljs-logger')('ember-cli:blueprint');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
+const isAddon = require('../utilities/is-addon');
 
 const Promise = RSVP.Promise;
 const stat = RSVP.denodeify(fs.stat);
@@ -385,14 +386,24 @@ let Blueprint = CoreObject.extend({
   /**
     @private
     @method _checkInRepoAddonExists
-    @param {String} inRepoAddon
+    @param {Object} options
   */
-  _checkInRepoAddonExists(inRepoAddon) {
-    if (inRepoAddon) {
-      let addon = findAddonByName(this.project, inRepoAddon);
+  _checkInRepoAddonExists(options) {
+    let addon;
+
+    if (options.inRepoAddon) {
+      addon = findAddonByName(this.project, options.inRepoAddon);
+
       if (!addon) {
-        throw new SilentError(`You specified the in-repo-addon flag, but the ` +
-          `in-repo-addon '${inRepoAddon}' does not exist. Please check the name and try again.`);
+        throw new SilentError(`You specified the 'in-repo-addon' flag, but the ` +
+          `in-repo-addon '${options.inRepoAddon}' does not exist. Please check the name and try again.`);
+      }
+    }
+
+    if (options.in) {
+      if (!ensureTargetDirIsAddon(options.in)) {
+        throw new SilentError(`You specified the 'in' flag, but the ` +
+          `in repo addon '${options.in}' does not exist. Please check the name and try again.`);
       }
     }
   },
@@ -438,7 +449,7 @@ let Blueprint = CoreObject.extend({
 
     this._normalizeEntityName(options.entity);
     this._checkForPod(options.verbose);
-    this._checkInRepoAddonExists(options.inRepoAddon);
+    this._checkInRepoAddonExists(options);
 
     logger.info('START: processing blueprint: `%s`', this.name);
     let start = new Date();
@@ -599,6 +610,10 @@ let Blueprint = CoreObject.extend({
           let relativeAddonPath = path.relative(project.root, addon.root);
           return path.join(relativeAddonPath, 'addon');
         }
+        if (options.in) {
+          let relativeAddonPath = path.relative(project.root, options.in);
+          return path.join(relativeAddonPath, 'addon');
+        }
         if (options.inDummy) {
           return path.join('tests', 'dummy', 'app');
         }
@@ -800,6 +815,7 @@ let Blueprint = CoreObject.extend({
       hasPathToken: this.hasPathToken,
       inAddon,
       inRepoAddon: options.inRepoAddon,
+      in: options.in,
       inDummy,
       blueprintName: this.name,
       originBlueprintName,
@@ -1496,6 +1512,22 @@ function findAddonByName(addonOrProject, name) {
   return addonOrProject.addons.find(addon => findAddonByName(addon, name));
 }
 
+function ensureTargetDirIsAddon(addonPath) {
+  let projectInfo;
+
+  try {
+    projectInfo = require(path.join(addonPath, 'package.json'));
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND') {
+      throw new Error(`The directory ${addonPath} does not appear to be a valid addon directory.`);
+    } else {
+      throw err;
+    }
+  }
+
+  return isAddon(projectInfo.keywords);
+}
+
 /**
   @private
   @method isValidFile