Update pluginutils for new micormatch (#2884)

* Update micromatch * Update rollup-pluginutils to update micromatch * Fix TypeScript issues
rollup · May 30, 2019 · 07b3686 · 07b3686
1 parent d4ce506
commit 07b3686
Show file tree

Hide file tree

Showing 8 changed files with 495 additions and 632 deletions.
diff --git a/bin/src/run/index.ts b/bin/src/run/index.ts
@@ -1,7 +1,7 @@
 import { realpathSync } from 'fs';
 import relative from 'require-relative';
-import { InputOptions, WarningHandler } from '../../../src/rollup/types';
-import mergeOptions from '../../../src/utils/mergeOptions';
+import { WarningHandler } from '../../../src/rollup/types';
+import mergeOptions, { GenericConfigObject } from '../../../src/utils/mergeOptions';
 import { getAliasName } from '../../../src/utils/relativeId';
 import { handleError } from '../logging';
 import batchWarnings from './batchWarnings';
@@ -93,7 +93,7 @@ export default function runRollup(command: any) {
 	}
 }
 
-function execute(configFile: string, configs: InputOptions[], command: any) {
+function execute(configFile: string, configs: GenericConfigObject[], command: any) {
 	if (command.watch) {
 		watch(configFile, configs, command, command.silent);
 	} else {

diff --git a/bin/src/run/loadConfigFile.ts b/bin/src/run/loadConfigFile.ts
@@ -1,7 +1,8 @@
 import path from 'path';
 import rollup from 'rollup';
 import tc from 'turbocolor';
-import { InputOptions, RollupBuild, RollupOutput } from '../../../src/rollup/types';
+import { RollupBuild, RollupOutput } from '../../../src/rollup/types';
+import { GenericConfigObject } from '../../../src/utils/mergeOptions';
 import relativeId from '../../../src/utils/relativeId';
 import { handleError, stderr } from '../logging';
 import batchWarnings from './batchWarnings';
@@ -13,7 +14,7 @@ interface NodeModuleWithCompile extends NodeModule {
 export default function loadConfigFile(
 	configFile: string,
 	commandOptions: any = {}
-): Promise<InputOptions[]> {
+): Promise<GenericConfigObject[]> {
 	const silent = commandOptions.silent || false;
 	const warnings = batchWarnings();
 

diff --git a/bin/src/run/watch.ts b/bin/src/run/watch.ts
@@ -12,7 +12,7 @@ import {
 	WarningHandler,
 	WatcherOptions
 } from '../../../src/rollup/types';
-import mergeOptions from '../../../src/utils/mergeOptions';
+import mergeOptions, { GenericConfigObject } from '../../../src/utils/mergeOptions';
 import relativeId from '../../../src/utils/relativeId';
 import { handleError, stderr } from '../logging';
 import alternateScreen from './alternateScreen';
@@ -36,7 +36,7 @@ interface Watcher {
 
 export default function watch(
 	configFile: string,
-	configs: RollupWatchOptions[],
+	configs: GenericConfigObject[],
 	command: any,
 	silent = false
 ) {
@@ -57,7 +57,7 @@ export default function watch(
 	let watcher: Watcher;
 	let configWatcher: Watcher;
 
-	function processConfigs(configs: RollupWatchOptions[]): RollupWatchOptions[] {
+	function processConfigs(configs: GenericConfigObject[]): RollupWatchOptions[] {
 		return configs.map(options => {
 			const merged = mergeOptions({
 				command,