Merge pull request #1536 from rollup/gh-1533

pass through all necessary options to bundle.write in rollup.watch

src/watch/index.js

@@ -159,11 +159,8 @@ class Task {
 
 				return Promise.all(
 					this.targets.map(target => {
-						return bundle.write({
-							format: target.format,
-							dest: target.dest,
-							moduleName: this.options.moduleName
-						});
+						const options = Object.assign({}, this.options, target);
+						return bundle.write(options);
 					})
 				);
 			})

test/watch/index.js

@@ -341,5 +341,35 @@ describe('rollup.watch', () => {
 					]);
 				});
 		});
+
+		it('respects options.globals', () => {
+			return sander
+				.copydir('test/watch/samples/globals')
+				.to('test/_tmp/input')
+				.then(() => {
+					const watcher = rollup.watch({
+						entry: 'test/_tmp/input/main.js',
+						dest: 'test/_tmp/output/bundle.js',
+						format: 'iife',
+						watch: { chokidar },
+						external: ['jquery'],
+						globals: {
+							jquery: 'jQuery'
+						}
+					});
+
+					return sequence(watcher, [
+						'START',
+						'BUNDLE_START',
+						'BUNDLE_END',
+						'END',
+						() => {
+							const generated = sander.readFileSync('test/_tmp/output/bundle.js', { encoding: 'utf-8' });
+							assert.ok(/jQuery/.test(generated));
+							watcher.close();
+						}
+					]);
+				});
+		});
 	}
 });

test/watch/samples/globals/main.js

@@ -0,0 +1,3 @@
+import $ from 'jquery';
+
+$('body').html('<h1>Hello world!</h1>');