Merge branch 'master' into transform-bundle-hook-compose-sourcemaps

CHANGELOG.md

@@ -1,5 +1,17 @@
 # rollup changelog
 
+## 0.22.2
+
+* Prevent lost `var` keywords ([#390](https://github.com/rollup/rollup/issues/390))
+
+## 0.22.1
+
+* Update expected option keys ([#379](https://github.com/rollup/rollup/issues/379))
+* Handle transformers that return stringified sourcemaps ([#377](https://github.com/rollup/rollup/issues/377))
+* Automatically create missing namespaces if `moduleName` contains dots ([#378](https://github.com/rollup/rollup/issues/378))
+* Ignore external dependency warnings coming from config file ([#333](https://github.com/rollup/rollup/issues/333))
+* Update to latest magic-string for performance boost
+
 ## 0.22.0
 
 * Duplicate warnings are squelched ([#362](https://github.com/rollup/rollup/issues/362))

bin/runRollup.js

@@ -27,7 +27,10 @@ module.exports = function ( command ) {
 
 		rollup.rollup({
 			entry: config,
-			onwarn: log
+			onwarn: function ( message ) {
+				if ( /Treating .+ as external dependency/.test( message ) ) return;
+				log( message );
+			}
 		}).then( function ( bundle ) {
 			var code = bundle.generate({
 				format: 'cjs'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "jsnext:main": "src/rollup.js",
@@ -48,7 +48,7 @@
     "eslint": "^1.7.1",
     "estree-walker": "^0.2.0",
     "istanbul": "^0.4.0",
-    "magic-string": "^0.10.0",
+    "magic-string": "^0.10.1",
     "mocha": "^2.3.3",
     "remap-istanbul": "^0.4.0",
     "rollup": "^0.20.2",

test/function/vars-not-removed/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'does not erroneously remove var/let/const keywords (#390)'
+};

test/function/vars-not-removed/bar.js

@@ -0,0 +1,3 @@
+var a = 2, b = 3;
+
+assert.equal( a + b, 5 );

test/function/vars-not-removed/foo.js

@@ -0,0 +1,3 @@
+var a = 1, b = 2;
+
+assert.equal( a + b, 3 );

test/function/vars-not-removed/main.js

@@ -0,0 +1,2 @@
+import './foo.js';
+import './bar.js';