type fix, output options deprecations

rollup · Aug 14, 2018 · a177f2b · a177f2b
1 parent 640680d
commit a177f2b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/src/rollup/index.ts b/src/rollup/index.ts
@@ -43,10 +43,6 @@ function checkOutputOptions(options: OutputOptions) {
 			url: `https://rollupjs.org/#format-f-output-format-`
 		});
 	}
-
-	if (options.moduleId) {
-		if (options.amd) throw new Error('Cannot have both output.amd and output.moduleId');
-	}
 }
 
 const throwAsyncGenerateError = {

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -287,14 +287,7 @@ export interface OutputOptions {
 	namespaceToStringTag?: boolean;
 	compact?: boolean;
 
-	/** @deprecated */
 	noConflict?: boolean;
-
-	// deprecated
-	/** @deprecated */
-	dest?: string;
-	/** @deprecated */
-	moduleId?: string;
 }
 
 export interface OutputOptionsFile extends OutputOptions {

diff --git a/src/watch/index.ts b/src/watch/index.ts
@@ -271,6 +271,6 @@ export class Task {
 	}
 }
 
-export default function watch(configs: RollupWatchOptions[]) {
+export default function watch(configs: RollupWatchOptions[]): EventEmitter {
 	return new Watcher(configs);
 }