Merge branch 'master' into remove-string-fmt

.eslintrc-browser.js

@@ -0,0 +1,44 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+  },
+  extends: 'eslint:recommended',
+  plugins: [
+    "ember-internal"
+  ],
+  env: {
+    qunit: true,
+  },
+  globals: {
+    'expectAssertion': true,
+    'expectDeprecation': true,
+    'expectNoDeprecation': true,
+    'expectWarning': true,
+    'expectNoWarning': true,
+    'ignoreAssertion': true,
+    'ignoreDeprecation': true,
+
+    // A safe subset of "browser:true":
+    'window': true,
+    'document': true,
+    'setTimeout': true,
+    'clearTimeout': true,
+    'setInterval': true,
+    'clearInterval': true,
+    'console': true,
+
+    'Set': true,
+    'Symbol': true,
+    'WeakMap': true,
+  },
+  rules: {
+    'ember-internal/require-yuidoc-access': 'error',
+    'ember-internal/no-const-outside-module-scope': 'error',
+
+    'semi': 'error',
+    'no-unused-vars': 'error',
+    'comma-dangle': 'off',
+  },
+};

.eslintrc-node.js

@@ -0,0 +1,24 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 8,
+    sourceType: 'module',
+  },
+  extends: 'eslint:recommended',
+  plugins: [
+    "ember-internal"
+  ],
+  env: {
+    mocha: true,
+    node: true,
+    qunit: true
+  },
+  globals: {
+    Map: false,
+    Set: false
+  },
+  rules: {
+    'semi': 'error',
+    'no-unused-vars': 'error'
+  }
+};

.eslintrc.js

@@ -1,44 +1 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: 6,
-    sourceType: 'module',
-  },
-  extends: 'eslint:recommended',
-  plugins: [
-    "ember-internal"
-  ],
-  env: {
-    qunit: true,
-  },
-  globals: {
-    'expectAssertion': true,
-    'expectDeprecation': true,
-    'expectNoDeprecation': true,
-    'expectWarning': true,
-    'expectNoWarning': true,
-    'ignoreAssertion': true,
-    'ignoreDeprecation': true,
-
-    // A safe subset of "browser:true":
-    'window': true,
-    'document': true,
-    'setTimeout': true,
-    'clearTimeout': true,
-    'setInterval': true,
-    'clearInterval': true,
-
-    'Symbol': true,
-    'WeakMap': true,
-  },
-  rules: {
-    'ember-internal/require-yuidoc-access': 'error',
-    'ember-internal/no-const-outside-module-scope': 'error',
-
-    'semi': 'error',
-
-    // temporarily disabled
-    'no-unused-vars': 'off',
-    'comma-dangle': 'off',
-  },
-};
+module.exports = require('./.eslintrc-node');

.travis.yml

@@ -58,12 +58,12 @@ env:
       I/BFT0MbnR6JVCZiPV7TCWPgY1gvgZ6TEEIKGqauDMUBdL8ZK6I='
     - secure: e0yxVfwVW61d3Mi/QBOsY6Rfd1mZd3VXUd9xNRoz/fkvQJRuVwDe7oG3NOuJ4LZzvMw7BJ+zpDV9D8nKhAyPEEOgpkkMHUB7Ds83pHG4qSMzm4EAwBCadDLXCQirldz8dzN5FAqgGucXoj5fj/p2SKOkO6qWIZveGr8pdBJEG1E=
   matrix:
+    - TEST_SUITE=sauce
     - TEST_SUITE=each-package-tests PUBLISH=true
     - TEST_SUITE=built-tests EMBER_ENV=production DISABLE_JSCS=true DISABLE_JSHINT=true
     - TEST_SUITE=old-jquery-and-extend-prototypes DISABLE_JSCS=true DISABLE_JSHINT=true
     - TEST_SUITE=node DISABLE_JSCS=true DISABLE_JSHINT=true
     - TEST_SUITE=blueprints
     - TEST_SUITE=travis-browsers DISABLE_JSCS=true DISABLE_JSHINT=true
-    - TEST_SUITE=sauce
-    - TEST_SUITE=allow-backtracking-rerender ALLOW_BACKTRACKING=true
     - TEST_SUITE=each-package-tests BUILD_TYPE=alpha PUBLISH=true
+    - TEST_SUITE=code-quality

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Ember Changelog
 
+### 2.18.0-beta.4 (December 19, 2017)
+- [#15982](https://github.com/emberjs/ember.js/pull/15982) [BUGFIX] Fix issue with unchaining ChainNodes (again)
+
+### 2.18.0-beta.3 (December 12, 2017)
+
+- [#15924](https://github.com/emberjs/ember.js/pull/15924) / [#15940](https://github.com/emberjs/ember.js/pull/15940) [BUGFIX] Assert that `classNameBinding` items are non-empty strings
+- [#15927](https://github.com/emberjs/ember.js/pull/15927) [BUGFIX] Extend test framework detection to `ember-qunit` and `ember-mocha`
+- [#15935](https://github.com/emberjs/ember.js/pull/15935) [BUGFIX] Fix framework detection in blueprints to work with prerelease versions of ember-cli-mocha
+
+### 2.18.0-beta.2 (December 4, 2017)
+
+- [#15902](https://github.com/emberjs/ember.js/pull/15902) [BUGFIX] Fix link-to throwing in integration tests
+- [#15905](https://github.com/emberjs/ember.js/pull/15905) [BUGFIX] Improve error message when calling `inject()`.
+- [#15919](https://github.com/emberjs/ember.js/pull/15919) [BUGFIX] Upgrade Backburner.js to v1.3.3, fixing an issue canceling tasks scheduled by scheduleOnce.
+
 ### 2.18.0-beta.1 (November 29, 2017)
 
 - [#14590](https://github.com/emberjs/ember.js/pull/14590) [DEPRECATION] Deprecate using `targetObject`.

FEATURES.md

@@ -27,6 +27,21 @@ for a detailed explanation.
   Adds an ability to for developers to integrate their own custom component managers
   into Ember Applications per [RFC](https://github.com/emberjs/rfcs/blob/custom-components/text/0000-custom-components.md).
 
+* `ember-glimmer-named-arguments`
+
+  Add `{{@foo}}` syntax to access named arguments in component templates per
+  [RFC](https://github.com/emberjs/rfcs/pull/276).
+
+* `ember-glimmer-remove-application-template-wrapper`
+
+  Remove the `<div>` wrapper around the application template per
+  [RFC](https://github.com/emberjs/rfcs/pull/280).
+
+* `ember-glimmer-template-only-components`
+
+  Use Glimmer Components semantics for template-only components per
+  [RFC](https://github.com/emberjs/rfcs/pull/278).
+
 * `ember-module-unification`
 
   Introduces support for Module Unification

bin/feature-flag-yuidoc-filter.js

@@ -42,14 +42,14 @@ function updateClassReferencesInNamespaces(data) {
     var originalClasses = data.modules[namespace].classes;
     for (var className in originalClasses) {
       if (data.classes.hasOwnProperty(className)) {
-        namespaceClasses[className] = originalClasses[className]
+        namespaceClasses[className] = originalClasses[className];
       }
     }
     data.modules[namespace].classes = namespaceClasses;
   }
 }
 
-module.exports = function (data, options) {
+module.exports = function (data) {
   var featuresToFilter = gatherFeatures();
   data.classes = gatherClassesToDocument(data, featuresToFilter);
   updateClassReferencesInNamespaces(data);

bin/run-node-tests.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+/* eslint-disable no-console */
+
 global.QUnit = require('qunitjs');
 
 // Adds test reporting.

bin/run-sauce-tests.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+/* eslint-disable no-console */
+
 var RSVP  = require('rsvp');
 var spawn = require('child_process').spawn;