ember-cli 3.4.4 → 3.5.1

package/lib/models/builder.js

@@ -11,6 +11,7 @@ const findBuildFile = require('../utilities/find-build-file');
 const _resetTreeCache = require('./addon')._resetTreeCache;
 const Sync = require('tree-sync');
 const heimdall = require('heimdalljs');
+const { isExperimentEnabled } = require('../experiments');
 
 /**
  * Wrapper for the Broccoli [Builder](https://github.com/broccolijs/broccoli/blob/master/lib/builder.js) class.
@@ -26,7 +27,10 @@ class Builder extends CoreObject {
   constructor(options) {
     super(options);
 
+    // Use Broccoli 2.0 by default, if this fails due to .read/.rebuild API, fallback to broccoli-builder
+    this.broccoliBuilderFallback = false;
     this.setupBroccoliBuilder();
+
     this._instantiationStack = (new Error()).stack.replace(/[^\n]*\n/, '');
     this._cleanup = this.cleanup.bind(this);
 
@@ -36,6 +40,21 @@ class Builder extends CoreObject {
     this._onProcessInterrupt.addHandler(this._cleanup);
   }
 
+  /**
+   * @private
+   * @method readBuildFile
+   * @param path The file path to read the build file from
+   */
+  readBuildFile(path) {
+    // Load the build file
+    let buildFile = findBuildFile('ember-cli-build.js', path);
+    if (buildFile) {
+      return buildFile({ project: this.project });
+    }
+
+    throw new SilentError('No ember-cli-build.js found.');
+  }
+
   /**
    * @private
    * @method setupBroccoliBuilder
@@ -44,16 +63,51 @@ class Builder extends CoreObject {
     this.environment = this.environment || 'development';
     process.env.EMBER_ENV = process.env.EMBER_ENV || this.environment;
 
-    const broccoli = require('broccoli-builder');
+    this.tree = this.readBuildFile(this.project.root);
 
-    let buildFile = findBuildFile('ember-cli-build.js');
-    if (buildFile) {
-      this.tree = buildFile({ project: this.project });
-    } else {
-      throw new SilentError('No ember-cli-build.js found.');
+    let broccoli, options = {};
+    if (isExperimentEnabled('BROCCOLI_2')) {
+      broccoli = require('broccoli');
+      let tmpDir;
+
+      // If not using system temp dir, compatability mode with broccoli-builder, tmp in root
+      if (!isExperimentEnabled('SYSTEM_TEMP')) {
+        tmpDir = `${this.project.root}/tmp`;
+        if (!fs.existsSync(tmpDir)) {
+          fs.mkdir(tmpDir);
+        }
+      }
+      options = {
+        tmpdir: tmpDir,
+      };
+
+      try {
+        this.builder = new broccoli.Builder(this.tree, options);
+        return;
+      } catch (e) {
+        // Catch here to trap InvalidNodeError. If this is thrown, it's because the node provided is not valid
+        // and likely uses the old .read/.rebuild API, so fallback to broccoli-builder that supports that API
+        if (
+          !(e instanceof broccoli.Builder.InvalidNodeError) ||
+          e.message.indexOf('The .read/.rebuild API is no longer supported as of Broccoli 1.0') === -1
+        ) {
+          throw e;
+        }
+
+        // Fallback to broccoli-builder
+        let error = `Invalid Broccoli2 node detected, falling back to broccoli-builder. Broccoli error:\n`;
+        error += `---------------\n`;
+        error += e.message;
+        error += `---------------\n`;
+        this.ui.writeWarnLine(error);
+      }
+    } else if (isExperimentEnabled('SYSTEM_TEMP')) {
+      this.ui.writeWarnLine('EMBER_CLI_SYSTEM_TEMP only works in combination with EMBER_CLI_BROCCOLI_2');
     }
 
-    this.builder = new broccoli.Builder(this.tree);
+    broccoli = require('broccoli-builder');
+    this.broccoliBuilderFallback = true;
+    this.builder = new broccoli.Builder(this.tree, options);
   }
 
   /**
@@ -145,13 +199,22 @@ class Builder extends CoreObject {
    * @method build
    * @return {Promise}
    */
-  build(willReadStringDir, resultAnnotation) {
+  build(addWatchDirCallback, resultAnnotation) {
     this.project._instrumentation.start('build');
 
-    attemptNeverIndex('tmp');
+    if (!isExperimentEnabled('SYSTEM_TEMP')) {
+      attemptNeverIndex('tmp');
+    }
+
+    if (addWatchDirCallback && !this.broccoliBuilderFallback) {
+      for (let path of this.builder.watchedPaths) {
+        addWatchDirCallback(path);
+      }
+    }
 
     return this.processAddonBuildSteps('preBuild')
-      .then(() => this.builder.build(willReadStringDir))
+      .then(() => this.builder.build(this.broccoliBuilderFallback ? addWatchDirCallback : null))
+      .then(this.compatNode.bind(this), this.compatBroccoliPayload.bind(this))
       .then(this.processAddonBuildSteps.bind(this, 'postBuild'))
       .then(this.processBuildResult.bind(this))
       .then(this.processAddonBuildSteps.bind(this, 'outputReady'))
@@ -190,13 +253,15 @@ class Builder extends CoreObject {
 
       let node = heimdall.start({ name: 'Builder Cleanup' });
 
-      this._cleanupPromise = this.builder.cleanup().finally(() => {
-        ui.stopProgress();
-        node.stop();
-      }).catch(err => {
-        ui.writeLine(chalk.red('Cleanup error.'));
-        ui.writeError(err);
-      });
+      this._cleanupPromise = Promise.resolve()
+        .then(() => this.builder.cleanup())
+        .finally(() => {
+          ui.stopProgress();
+          node.stop();
+        }).catch(err => {
+          ui.writeLine(chalk.red('Cleanup error.'));
+          ui.writeError(err);
+        });
     }
 
     return this._cleanupPromise;
@@ -226,6 +291,61 @@ class Builder extends CoreObject {
   finalizeBuild() {
     this.project.configCache.clear();
   }
+
+  /**
+   * broccoli-builder reformats the response into {directory, graph}, this method is a backwards
+   * compatible shim for broccoli 1.x
+   * @private
+   * @method compatNode
+   * @param node The node returned from Broccoli builder
+   */
+  compatNode(node) {
+    if (!this.broccoliBuilderFallback) {
+      return {
+        directory: this.builder.outputPath,
+        graph: this.builder.outputNodeWrapper,
+      };
+    }
+
+    return node;
+  }
+
+  compatBroccoliPayload(err) {
+    // TODO fix ember-cli/console-ui to handle current broccoli broccoliPayload
+    let broccoliPayload = err && err.broccoliPayload;
+    if (broccoliPayload) {
+      if (!broccoliPayload.error) {
+        let originalError = broccoliPayload.originalError || {};
+        let location = broccoliPayload.location || originalError.location;
+        broccoliPayload.error = {
+          message: originalError.message,
+          stack: originalError.stack,
+          errorType: originalError.type || 'Build Error',
+          codeFrame: originalError.codeFrame || originalError.message,
+          location: location || {},
+        };
+      }
+      if (!broccoliPayload.broccoliNode) {
+        broccoliPayload.broccoliNode = {
+          nodeName: broccoliPayload.nodeName,
+          nodeAnnotation: broccoliPayload.nodeAnnotation,
+          instantiationStack: broccoliPayload.instantiationStack || '',
+        };
+      }
+      if (!broccoliPayload.versions) {
+        let builderVersion = this.broccoliBuilderFallback
+          ? require('broccoli-builder/package').version
+          : require('broccoli/package').version;
+
+        broccoliPayload.versions = {
+          'broccoli-builder': builderVersion,
+          node: process.version,
+        };
+      }
+    }
+
+    throw err;
+  }
 }
 
 module.exports = Builder;

package/lib/models/command.js

@@ -266,7 +266,7 @@ let Command = CoreObject.extend({
     @return {Promise}
   */
   validateAndRun(args) {
-    return new Promise(resolve => {
+    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)) {
@@ -280,7 +280,7 @@ let Command = CoreObject.extend({
       });
 
       if (commandOptions === null) {
-        return resolve();
+        return reject();
       }
 
       if (this.works === 'outsideProject' && this.isWithinProject) {

package/lib/models/package-info-cache/index.js

@@ -11,6 +11,7 @@ const ErrorList = require('./error-list');
 const Errors = require('./errors');
 const PackageInfo = require('./package-info');
 const NodeModulesList = require('./node-modules-list');
+const logger = require('heimdalljs-logger')('ember-cli:package-info-cache');
 
 let realFilePathCache;
 let realDirectoryPathCache;
@@ -178,29 +179,29 @@ class PackageInfoCache {
       return;
     }
 
-    this.ui.writeWarnLine('');
+    logger.info('');
     let rootPath;
 
     if (obj instanceof PackageInfoCache) {
-      this.ui.writeWarnLine('Top level errors:');
+      logger.info('Top level errors:');
       rootPath = this.realPath || '';
     } else {
       let typeName = (obj.project ? 'project' : 'addon');
 
-      this.ui.writeWarnLine(`The 'package.json' file for the ${typeName} at ${obj.realPath}`);
+      logger.info(`The 'package.json' file for the ${typeName} at ${obj.realPath}`);
       rootPath = obj.realPath;
     }
 
     errorEntries.forEach(errorEntry => {
       switch (errorEntry.type) {
         case Errors.ERROR_PACKAGE_JSON_MISSING:
-          this.ui.writeWarnLine(`  does not exist`);
+          logger.info(`  does not exist`);
           break;
         case Errors.ERROR_PACKAGE_JSON_PARSE:
-          this.ui.writeWarnLine(`  could not be parsed`);
+          logger.info(`  could not be parsed`);
           break;
         case Errors.ERROR_EMBER_ADDON_MAIN_MISSING:
-          this.ui.writeWarnLine(
+          logger.info(
             `  specifies a missing ember-addon 'main' file at relative path '${path.relative(
               rootPath,
               errorEntry.data
@@ -209,18 +210,18 @@ class PackageInfoCache {
           break;
         case Errors.ERROR_DEPENDENCIES_MISSING:
           if (errorEntry.data.length === 1) {
-            this.ui.writeWarnLine(
+            logger.info(
               `  specifies a missing dependency '${errorEntry.data[0]}'`
             );
           } else {
-            this.ui.writeWarnLine(`  specifies some missing dependencies:`);
+            logger.info(`  specifies some missing dependencies:`);
             errorEntry.data.forEach(dependencyName => {
-              this.ui.writeWarnLine(`    ${dependencyName}`);
+              logger.info(`    ${dependencyName}`);
             });
           }
           break;
         case Errors.ERROR_NODEMODULES_ENTRY_MISSING:
-          this.ui.writeWarnLine(`  specifies a missing 'node_modules/${errorEntry.data}' directory`);
+          logger.info(`  specifies a missing 'node_modules/${errorEntry.data}' directory`);
           break;
       }
     });

package/lib/models/package-info-cache/package-info.js

@@ -4,6 +4,8 @@ const path = require('path');
 const ErrorList = require('./error-list');
 const Errors = require('./errors');
 const AddonInfo = require('../addon-info');
+const isAddon = require('../../utilities/is-addon');
+const logger = require('heimdalljs-logger')('ember-cli:package-info-cache:package-info');
 
 function lexicographically(a, b) {
   const aIsString = typeof a.name === 'string';
@@ -218,10 +220,7 @@ class PackageInfo {
   }
 
   isAddon() {
-    let val =
-      Array.isArray(this.pkg.keywords) &&
-      this.pkg.keywords.indexOf('ember-addon') >= 0;
-    return val;
+    return isAddon(this.pkg.keywords);
   }
 
   /**
@@ -338,24 +337,22 @@ class PackageInfo {
 
     let invalidPackages = this.getInvalidPackages(addonPackageList);
 
-    let ui = this.cache.ui;
-
-    if (invalidPackages.length > 0 && ui && ui.writeWarnLine) {
+    if (invalidPackages.length > 0) {
       let typeName = (this.project ? 'project' : 'addon');
 
-      ui.writeWarnLine('');
-      ui.writeWarnLine(`The 'package.json' file for the ${typeName} at ${this.realPath}`);
+      logger.info('');
+      logger.info(`The 'package.json' file for the ${typeName} at ${this.realPath}`);
 
       let relativePath;
 
       if (invalidPackages.length === 1) {
         relativePath = path.relative(this.realPath, invalidPackages[0].realPath);
-        ui.writeWarnLine(`  specifies an invalid, malformed or missing addon at relative path '${relativePath}'`);
+        logger.info(`  specifies an invalid, malformed or missing addon at relative path '${relativePath}'`);
       } else {
-        ui.writeWarnLine('  specifies invalid, malformed or missing addons at relative paths');
+        logger.info('  specifies invalid, malformed or missing addons at relative paths');
         invalidPackages.forEach(packageInfo => {
           let relativePath = path.relative(this.realPath, packageInfo.realPath);
-          ui.writeWarnLine(`    '${relativePath}'`);
+          logger.info(`    '${relativePath}'`);
         });
       }
     }

package/lib/models/project.js

@@ -17,7 +17,6 @@ const heimdall = require('heimdalljs');
 const PackageInfoCache = require('../models/package-info-cache');
 
 const instantiateAddons = require('../models/instantiate-addons');
-const experiments = require('../experiments');
 
 let processCwd = process.cwd();
 
@@ -216,7 +215,8 @@ class Project {
      @return {Boolean} Whether this is using a module unification format.
     */
   isModuleUnification() {
-    if (experiments.MODULE_UNIFICATION) {
+    const { isExperimentEnabled } = require('../experiments');
+    if (isExperimentEnabled('MODULE_UNIFICATION')) {
       return this.has('src');
     } else {
       return false;
@@ -630,7 +630,7 @@ class Project {
     Generate test file contents.
 
     This method is supposed to be overwritten by test framework addons
-    like `ember-cli-qunit` and `ember-cli-mocha`.
+    like `ember-qunit` and `ember-mocha`.
 
     @public
     @method generateTestFile

package/lib/models/watcher.js

@@ -20,6 +20,7 @@ class Watcher extends CoreObject {
 
     this.watcher.on('error', this.didError.bind(this));
     this.watcher.on('change', this.didChange.bind(this));
+    this.serveURL = serveURL;
   }
 
   constructWatcher(options) {
@@ -47,7 +48,7 @@ class Watcher extends CoreObject {
     this.ui.writeLine('');
 
     if (this.serving) {
-      message += ` – Serving on ${serveURL(this.options, this.options.project)}`;
+      message += ` – Serving on ${this.serveURL(this.options, this.options.project)}`;
     }
 
     this.ui.writeLine(message);

package/lib/tasks/npm-task.js

@@ -26,7 +26,7 @@ class NpmTask extends Task {
     // The command to run: can be 'install' or 'uninstall'
     this.command = '';
 
-    this.versionConstraints = '3 || 4 || 5';
+    this.versionConstraints = '3 || 4 || 5 || 6';
   }
 
   npm(args) {

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

@@ -214,7 +214,7 @@ class ExpressServerTask extends Task {
 
     let options = this.startOptions;
     options.httpServer = this.httpServer;
-    let liveReloadServer = null;
+    let liveReloadServer;
 
     if (options.path) {
       liveReloadServer = {

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

@@ -8,6 +8,7 @@ const logger = require('heimdalljs-logger')('ember-cli:live-reload:');
 const fs = require('fs');
 const Promise = require('rsvp').Promise;
 const cleanBaseUrl = require('clean-base-url');
+const isLiveReloadRequest = require('../../utilities/is-live-reload-request');
 
 function isNotRemoved(entryTuple) {
   let operation = entryTuple[0];
@@ -102,7 +103,7 @@ module.exports = class LiveReloadServer {
     // Reload on express server restarts
     this.app.on('restart', this.didRestart.bind(this));
     this.httpServer.on('upgrade', (req, socket, head) => {
-      if (req.url.indexOf('/livereload') === 0) {
+      if (isLiveReloadRequest(req.url, this.liveReloadPrefix)) {
         this.liveReloadServer.websocketify(req, socket, head);
       }
     });

package/lib/tasks/server/middleware/proxy-server/index.js

@@ -1,5 +1,8 @@
 'use strict';
 
+// eslint-disable-next-line
+const isLiveReloadRequest = require('../../../../utilities/is-live-reload-request');
+
 class ProxyServerAddon {
   constructor(project) {
     this.project = project;
@@ -18,6 +21,8 @@ class ProxyServerAddon {
         changeOrigin: true,
         xfwd: options.transparentProxy,
         preserveHeaderKeyCase: true,
+        proxyTimeout: options.proxyOutTimeout,
+        timeout: options.proxyInTimeout,
       });
 
       proxy.on('error', e => {
@@ -30,7 +35,7 @@ class ProxyServerAddon {
       options.ui.writeLine(`Proxying to ${options.proxy}`);
 
       server.on('upgrade', (req, socket, head) => {
-        this.handleProxiedRequest(req, socket, head, options, proxy);
+        this.handleProxiedRequest({ req, socket, head, options, proxy });
       });
 
       app.use(morgan('dev'));
@@ -38,8 +43,8 @@ class ProxyServerAddon {
     }
   }
 
-  handleProxiedRequest(req, socket, head, options, proxy) {
-    if (req.url.indexOf('/livereload') === -1) {
+  handleProxiedRequest({ req, socket, head, options, proxy }) {
+    if (!isLiveReloadRequest(req.url, options.liveReloadPrefix)) {
       options.ui.writeLine(`Proxying websocket to ${req.url}`);
       proxy.ws(req, socket, head);
     }

package/lib/utilities/default-targets.js

@@ -2,7 +2,7 @@
 
 module.exports = {
   browsers: [
-    'ie 9',
+    'ie 11',
     'last 1 Chrome versions',
     'last 1 Firefox versions',
     'last 1 Safari versions',

package/lib/utilities/find-build-file.js

@@ -1,10 +1,9 @@
 'use strict';
-
 const findUp = require('find-up');
 const path = require('path');
 
-module.exports = function(file) {
-  let buildFilePath = findUp.sync(file);
+module.exports = function(file, dir) {
+  let buildFilePath = findUp.sync(file, { cwd: dir });
 
   // Note: In the future this should throw
   if (!buildFilePath) {

package/lib/utilities/is-addon.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = function isAddon(keywords) {
+  return Array.isArray(keywords) &&
+    keywords.indexOf('ember-addon') >= 0;
+};

package/lib/utilities/is-live-reload-request.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const cleanBaseUrl = require('clean-base-url');
+const deprecate = require('./deprecate');
+
+module.exports = function isLiveReloadRequest(url, liveReloadPrefix) {
+  let regex = /\/livereload$/gi;
+  if (url === `${cleanBaseUrl(liveReloadPrefix)}livereload`) {
+    return true;
+  } else if (regex.test(url)) {
+    //version needs to be updated according to the this PR (https://github.com/ember-cli/ember-cli-inject-live-reload/pull/55)
+    //in master of ember-cli-inject-live-reload.
+    deprecate(`Upgrade ember-cli-inject-live-reload version to 1.10.0 or above`, true);
+    return true;
+  }
+  return false;
+};

package/lib/utilities/valid-project-name.js

@@ -27,6 +27,7 @@ module.exports = function(name) {
     'ember',
     'ember-cli',
     'vendor',
+    'public',
     'app',
   ];
   name = name.toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "3.4.4",
+  "version": "3.5.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -31,7 +31,7 @@
     "lint": "node tests/runner lint",
     "test": "node tests/runner",
     "test:all": "node tests/runner all",
-    "test:cover": "istanbul cover tests/runner.js all",
+    "test:cover": "nyc node tests/runner all",
     "test:slow": "node tests/runner slow",
     "test:debug": "node debug tests/runner"
   },
@@ -40,7 +40,8 @@
     "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
     "bower-config": "^1.3.0",
     "bower-endpoint-parser": "0.2.2",
-    "broccoli-amd-funnel": "^1.3.0",
+    "broccoli": "^2.0.0",
+    "broccoli-amd-funnel": "^2.0.1",
     "broccoli-babel-transpiler": "^6.5.0",
     "broccoli-builder": "^0.18.14",
     "broccoli-concat": "^3.5.1",
@@ -79,6 +80,7 @@
     "filesize": "^3.6.1",
     "find-up": "^3.0.0",
     "find-yarn-workspace-root": "^1.1.0",
+    "fixturify": "^0.3.4",
     "fixturify-project": "^1.5.3",
     "fs-extra": "^7.0.0",
     "fs-tree-diff": "^0.5.7",
@@ -109,7 +111,7 @@
     "quick-temp": "^0.1.8",
     "resolve": "^1.8.1",
     "rsvp": "^4.8.3",
-    "sane": "^3.0.0",
+    "sane": "^4.0.0",
     "semver": "^5.5.0",
     "silent-error": "^1.1.0",
     "sort-package-json": "^1.15.0",
@@ -141,6 +143,8 @@
     "mocha-eslint": "^4.1.0",
     "multiline": "^1.0.2",
     "nock": "^9.4.4",
+    "nyc": "^12.0.2",
+    "rimraf": "^2.6.2",
     "strip-ansi": "^4.0.0",
     "supertest": "^3.1.0",
     "testdouble": "^3.8.1",

package/tests/helpers/default-packager.js

@@ -127,7 +127,6 @@ const DEFAULT_SOURCE = {
       'ember-cli-htmlbars': '^3.0.0',
       'ember-cli-htmlbars-inline-precompile': '^1.0.0',
       'ember-cli-inject-live-reload': '^1.4.1',
-      'ember-cli-qunit': '^4.1.1',
       'ember-cli-sass': '^7.1.3',
       'ember-cli-shims': '^1.2.0',
       'ember-cli-sri': '^2.1.0',
@@ -135,6 +134,7 @@ const DEFAULT_SOURCE = {
       'ember-data': '~3.0.0-beta.1',
       'ember-export-application-global': '^2.0.0',
       'ember-load-initializers': '^1.0.0',
+      'ember-qunit': '^3.4.1',
       'ember-resolver': '^4.0.0',
       'ember-source': '~3.0.0-beta.1',
       'loader.js': '^4.2.3',

package/tests/helpers/generate-utils.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const RSVP = require('rsvp');
+const fs = require('fs-extra');
+let outputFile = RSVP.denodeify(fs.outputFile);
+const ember = require('./ember');
+
+function inRepoAddon(path) {
+  return ember([
+    'generate',
+    'in-repo-addon',
+    path,
+  ]);
+}
+
+function tempBlueprint() {
+  return outputFile(
+    'blueprints/foo/files/__root__/foos/__name__.js',
+    '/* whoah, empty foo! */'
+  );
+}
+
+module.exports = {
+  inRepoAddon,
+  tempBlueprint,
+};

package/tests/helpers/init-app.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const ember = require('./ember');
+
+function initApp() {
+  return ember([
+    'init',
+    '--name=my-app',
+    '--skip-npm',
+    '--skip-bower',
+  ]);
+}
+
+module.exports = initApp;

package/tests/helpers/mock-project.js

@@ -7,10 +7,10 @@ const MockUI = require('console-ui/mock');
 // eslint-disable-next-line node/no-unpublished-require
 
 class MockProject extends Project {
-  constructor() {
-    let root = process.cwd();
-    let pkg = {};
-    let ui = new MockUI();
+  constructor(options = {}) {
+    let root = options.root || process.cwd();
+    let pkg = options.pkg || {};
+    let ui = options.ui || new MockUI();
     let instr = new Instrumentation({
       ui,
       initInstrumentation: {
@@ -18,7 +18,7 @@ class MockProject extends Project {
         node: null,
       },
     });
-    let cli = {
+    let cli = options.cli || {
       instrumentation: instr,
     };