Merge branch 'master' into new-namespace

.travis.yml

@@ -1,20 +1,18 @@
 language: node_js
 node_js:
-  - "7"
+  - "9"
+  - "8"
   - "6"
   - "4"
 
-after_success:
-  - "./bin/publish_to_s3.js"
 before_install:
   - nvm install 6
   - nvm use 6
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+
 before_script:
   - nvm use $TRAVIS_NODE_VERSION
+
 env:
   global:
   - EMBER_ENV=production
-  - secure: MiR5zbpHpblG1HcQyxzhYqxcb+3gGsjKWOjLYi1AOU4BG90+Ckim4mCJbneIHaBfeIZKZCm+X1wRRwUE0TlaMFEiXqReHt8k/1ChjfFdTicZtXYytbnGdRlHjvN/LVCaVhBiORSXWPzjIWhwYInMhCtekWTOqChtblRGdbrCLCY=
-  - secure: LF1yJIzr4z5e4RxFt+ZIwjazDyItPoPtSUgcoSQfTUhRtkxFsIRpOpf4VnzPH2FSpw4wbkNq+hm+K1xrKHNq+OE0PLYtD+H7i03ac993jReSJN8rwb0gpAlwAGWC++uF7j7aMKJAlZA1u4tnPD5cxuk6BKnNSONtD0BwKQ6oXkk=
-  - secure: MB2RZPsHVuikayckVYCVE9TWiooaFV+jyxEkpSoNJ5pRIVTwy9xRHK56S1sxkXmPIm7sYyaLWpngp13/CN80pT796HS8mEuxJ011XwjY6YutXHnR2gOrCssah6kQ6gaXO1sFVkerBa/GwdkKu/k8LVAiORiz1JlPZvOKDRsJaNw=

Brocfile.js

@@ -1,34 +1,30 @@
 'use strict';
-
 /* jshint node:true, undef:true, unused:true */
-const Rollup   = require('broccoli-rollup');
-const Babel    = require('broccoli-babel-transpiler');
-const merge    = require('broccoli-merge-trees');
-const uglify   = require('broccoli-uglify-js');
-const version  = require('git-repo-version');
+const Rollup = require('broccoli-rollup');
+const Babel = require('broccoli-babel-transpiler');
+const merge = require('broccoli-merge-trees');
+const funnel = require('broccoli-funnel');
+const uglify = require('broccoli-uglify-js');
+const version = require('git-repo-version');
 const watchify = require('broccoli-watchify');
-const concat   = require('broccoli-concat');
-const fs       = require('fs');
-
-const stew   = require('broccoli-stew');
-
-const find   = stew.find;
-const mv     = stew.mv;
-const rename = stew.rename;
-const env    = stew.env;
-const map    = stew.map;
+const concat = require('broccoli-concat');
+const stew = require('broccoli-stew');
 
-const lib       = find('lib');
+const env = stew.env;
+const map = stew.map;
 
-// test stuff
-const testDir   = find('test');
-const testFiles = find('test/{index.html,worker.js}');
+const lib = funnel('lib', { destDir: 'lib' });
 
-const json3     = mv(find('node_modules/json3/lib/{json3.js}'), 'node_modules/json3/lib/', 'test/');
-// mocha doesn't browserify correctly
-const mocha     = mv(find('node_modules/mocha/mocha.{js,css}'), 'node_modules/mocha/',    'test/');
+const testDir = funnel('test', { destDir: 'test' });
+const testFiles = funnel('test', {
+  files: ['index.html','worker.js'],
+  destDir: 'test'
+});
 
-const testVendor = merge([ json3, mocha ]);
+const mocha = funnel('node_modules/mocha', {
+  files: ['mocha.css','mocha.js'],
+  destDir: 'test'
+});
 
 const es5 = new Babel(lib, {
   plugins: [
@@ -49,49 +45,52 @@ const es5 = new Babel(lib, {
 // build RSVP itself
 const rsvp = new Rollup(es5, {
   rollup: {
-    entry: 'lib/rsvp.js',
-    targets: [
+    input: 'lib/rsvp.js',
+    output: [
       {
         format: 'umd',
-        moduleName: 'RSVP',
-        dest: 'rsvp.js',
-        sourceMap: 'inline'
+        name: 'RSVP',
+        file: 'rsvp.js',
+        sourcemap: 'inline'
       },
       {
         format: 'es',
-        dest: 'rsvp.es.js',
-        sourceMap: 'inline'
+        file: 'rsvp.es.js',
+        sourcemap: 'inline'
       }
     ]
   }
 });
 
 const rsvpES6 = new Rollup(lib, {
   rollup: {
-    entry: 'lib/rsvp.js',
-    targets: [
+    input: 'lib/rsvp.js',
+    output: [
       {
         format: 'es',
-        dest: 'es6/rsvp.es.js',
-        sourceMap: 'inline'
+        file: 'es6/rsvp.es.js',
+        sourcemap: 'inline'
       }
     ]
   }
 });
 
 const testBundle = watchify(merge([
-  mv(rsvp, 'test'),
+  funnel(rsvp, { destDir: 'test' }),
   testDir
 ]), {
   browserify: { debug: true, entries: ['./test/index.js'] }
 });
 
-const header = stew.map(find('config/versionTemplate.txt'), content => content.replace(/VERSION_PLACEHOLDER_STRING/, version()));
+const header = map(
+  funnel('config', { files: ['versionTemplate.txt'], destDir: 'config' }),
+  content => content.replace(/VERSION_PLACEHOLDER_STRING/, version())
+);
 
 function concatAs(tree, outputFile) {
   return concat(merge([tree, header]), {
     headerFiles: ['config/versionTemplate.txt'],
-    inputFiles:  ['rsvp.js'],
+    inputFiles: ['rsvp.js'],
     outputFile: outputFile
   });
 }
@@ -120,17 +119,17 @@ module.exports = merge([
     development(rsvp, header),
     concat(merge([rsvp, header]), {
       headerFiles: ['config/versionTemplate.txt'],
-      inputFiles:  ['rsvp.es.js'],
+      inputFiles: ['rsvp.es.js'],
       outputFile: 'rsvp.es.js'
     }),
     concat(merge([rsvpES6, header]), {
       headerFiles: ['config/versionTemplate.txt'],
-      inputFiles:  ['es6/rsvp.es.js'],
+      inputFiles: ['es6/rsvp.es.js'],
       outputFile: 'es6/rsvp.es.js'
     })
   ].filter(Boolean)),
   // test stuff
   testFiles,
-  testVendor,
-  mv(testBundle, 'test')
+  mocha,
+  funnel(testBundle, { destDir: 'test' })
 ]);

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Master
 
+# 4.7.0
+
+* Release the same code as 4.0.2 but as 4.7.0 (fixes issues with `npm outdated`, `yarn update-interactive`, etc caused by accidental publishing of 4.6.1).
+
+# 4.0.2
+
+* Fix issue which occurs when you have a `.finally` after a promise has rejected with no rejection value.
+
+# 4.0.1
+
+* Fix bug in `RSVP.filter` where it would only respect explicitly `true` values (unlike `[].filter` which allows truthy values).
+
 # 4.0.0
 
 * remove es3 fallbacks