merge

CHANGELOG.md

@@ -4,12 +4,13 @@
 
 * Fix `module.basename()` when used with custom `resolveId` function
 * Use [rollup-babel](https://github.com/rollup/rollup-babel) to build self
+* Exposed the version string through the API: `require( 'rollup' ).VERSION`
 
 ## 0.19.0
 
-* **breaking** The `transform` option is no longer pass through to custom loaders. Loaders should only concern themselves with providing source code; transformation will *always* take place
+* **breaking** The `transform` option is no longer passed through to custom loaders. Loaders should only concern themselves with providing source code; transformation will *always* take place
 * `options.transform` functions can return a string, or a `{code, map, ast}` object. Where possible, sourcemap chains will be flattened ([#175](https://github.com/rollup/rollup/pull/175))
-* `options.resolveId` and `options.load` can each be a function or an array of functions. If an array, the first non-null/undefined return value is used. In both cases, failed resolution/loading will fall back to the defaults, unless an error is thrown. ([#174](https://github.com/rollup/rollup/pull/174))
+* `options.resolveId`, `options.resolveExternal` and `options.load` can each be a function or an array of functions. If an array, the first non-null/undefined return value is used. In both cases, failed resolution/loading will fall back to the defaults, unless an error is thrown. ([#174](https://github.com/rollup/rollup/pull/174))
 * New `intro` and `outro` options – similar to `banner` and `footer` except inserted *inside* any format-specific wrapper
 * Multiple var declarations in an export block (e.g. `export let a = 1, b = 2`) are split up to facilitate tree-shaking ([#171](https://github.com/rollup/rollup/issues/171))
 * More informative error when using a missing namespace property  ([#169](https://github.com/rollup/rollup/pull/169))

package.json

@@ -51,7 +51,7 @@
     "gobble-cli": "^0.5.0",
     "gobble-rollup": "^0.10.0",
     "gobble-rollup-babel": "^0.5.0",
-    "istanbul": "^0.3.20",
+    "istanbul": "^0.4.0",
     "magic-string": "^0.7.0",
     "mocha": "^2.2.4",
     "remap-istanbul": "^0.3.0",

src/utils/first.js

@@ -1,3 +1,5 @@
+import Promise from 'es6-promise/lib/es6-promise/promise';
+
 // Return the first non-falsy result from an array of
 // maybe-sync, maybe-promise-returning functions
 export default function first ( candidates ) {