ember-cli 3.5.0 → 3.5.1

package/.travis.yml

@@ -10,11 +10,14 @@ node_js:
 
 branches:
   only:
+    - auto
     - master
     - beta
     - release
-    - auto
-    - /^greenkeeper.*$/
+    # release branches
+    - /^(?:release|lts)-\d+-\d+$/
+    # npm version tags
+    - /^v\d+\.\d+\.\d+/
 
 cache:
   yarn: true

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ember-cli Changelog
 
+## v3.5.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.5.0...v3.5.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.5.0...v3.5.1)
+
+#### Community Contributions
+
+- [#8127](https://github.com/ember-cli/ember-cli/pull/8127) Fix eslint errors in new app [@Gaurav0](https://github.com/Gaurav0)
+- [#8130](https://github.com/ember-cli/ember-cli/pull/8130) Use regex to parse /livereload urls [@rwjblue](https://github.com/rwjblue)
+- [#8141](https://github.com/ember-cli/ember-cli/pull/8141) Use `debug` for `package-info-cache` messages [@stefanpenner](https://github.com/stefanpenner)
+- [#8150](https://github.com/ember-cli/ember-cli/pull/8150) Fix `toTree()` with custom paths [@wagenet](https://github.com/wagenet)
+
+Thank you to all who took the time to contribute!
+
+
 ## v3.5.0
 
 The following changes are required if you are upgrading from the previous

package/blueprints/addon/files/addon-config/ember-try.js

@@ -14,7 +14,7 @@ module.exports = function() {
         {
           name: 'ember-lts-2.16',
           env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {
@@ -26,7 +26,7 @@ module.exports = function() {
         {
           name: 'ember-lts-2.18',
           env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {

package/blueprints/app/files/.eslintignore

@@ -8,6 +8,7 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/

package/blueprints/app/files/.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',<% if (blueprint !== 'app') { %>
         'index.js',<% } %>

package/blueprints/app/files/package.json

@@ -39,7 +39,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^3.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.5.0<% if (welcome) { %>",
+    "ember-source": "~3.5.1<% if (welcome) { %>",
     "ember-welcome-page": "^3.2.0<% } %>",
     "eslint-plugin-ember": "^5.2.0",
     "loader.js": "^4.7.0",

package/blueprints/module-unification-app/files/.eslintignore

@@ -8,6 +8,7 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/

package/blueprints/module-unification-app/files/.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',

package/blueprints/module-unification-app/files/config/environment.js

@@ -50,7 +50,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;

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;
@@ -1744,10 +1745,9 @@ class EmberApp {
    */
   toTree(additionalTrees) {
     let packagedTree;
-    let trees = this.toArray().concat(additionalTrees || []);
     let packageFn = this.options.package;
 
-    let fullTree = mergeTrees(trees, {
+    let fullTree = mergeTrees(this.toArray(), {
       overwrite: true,
       annotation: 'Full Application',
     });
@@ -1762,7 +1762,14 @@ class EmberApp {
       }
     }
 
-    return this.addonPostprocessTree('all', packagedTree || this._legacyPackage(fullTree));
+    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/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

@@ -5,6 +5,7 @@ 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';
@@ -336,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/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;
@@ -32,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'));
@@ -40,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",