RollupFileBuild -> RollupSingleFileBuild

rollup · May 27, 2018 · 1dcec6d · 1dcec6d
1 parent 3dec7b8
commit 1dcec6d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/bin/src/run/build.ts b/bin/src/run/build.ts
@@ -9,7 +9,7 @@ import {
 	InputOptions,
 	OutputChunk,
 	OutputOptions,
-	RollupFileBuild,
+	RollupSingleFileBuild,
 	RollupBuild,
 	OutputBundle
 } from '../../../src/rollup/types';
@@ -47,7 +47,7 @@ export default function build(
 
 	return rollup
 		.rollup(inputOptions)
-		.then((bundle: RollupFileBuild | RollupBuild) => {
+		.then((bundle: RollupSingleFileBuild | RollupBuild) => {
 			if (useStdout) {
 				const output = outputOptions[0];
 				if (output.sourcemap && output.sourcemap !== 'inline') {
@@ -57,7 +57,7 @@ export default function build(
 					});
 				}
 
-				return (<RollupFileBuild>bundle).generate(output).then(({ code, map }) => {
+				return (<RollupSingleFileBuild>bundle).generate(output).then(({ code, map }) => {
 					if (!code) return;
 					if (output.sourcemap === 'inline') {
 						code += `\n//# ${SOURCEMAPPING_URL}=${map.toUrl()}\n`;
@@ -72,7 +72,7 @@ export default function build(
 				output => bundle.write(output)
 			).then(() => bundle);
 		})
-		.then((bundle?: RollupFileBuild | RollupBuild) => {
+		.then((bundle?: RollupSingleFileBuild | RollupBuild) => {
 			warnings.flush();
 			if (!silent)
 				stderr(

diff --git a/bin/src/run/loadConfigFile.ts b/bin/src/run/loadConfigFile.ts
@@ -4,7 +4,7 @@ import rollup from 'rollup';
 import batchWarnings from './batchWarnings';
 import relativeId from '../../../src/utils/relativeId';
 import { handleError, stderr } from '../logging';
-import { InputOptions, RollupFileBuild } from '../../../src/rollup/types';
+import { InputOptions, RollupSingleFileBuild } from '../../../src/rollup/types';
 
 interface NodeModuleWithCompile extends NodeModule {
 	_compile(code: string, filename: string): any;
@@ -25,7 +25,7 @@ export default function loadConfigFile(
 			},
 			onwarn: warnings.add
 		})
-		.then((bundle: RollupFileBuild) => {
+		.then((bundle: RollupSingleFileBuild) => {
 			if (!silent && warnings.count > 0) {
 				stderr(chalk.bold(`loaded ${relativeId(configFile)} with warnings`));
 				warnings.flush();

diff --git a/bin/src/run/watch.ts b/bin/src/run/watch.ts
@@ -14,7 +14,7 @@ import { printTimings } from './timings';
 import {
 	RollupError,
 	RollupWatchOptions,
-	RollupFileBuild,
+	RollupSingleFileBuild,
 	RollupBuild,
 	InputOption
 } from '../../../src/rollup/types';
@@ -24,7 +24,7 @@ interface WatchEvent {
 	input?: InputOption;
 	output?: string[];
 	duration?: number;
-	result?: RollupFileBuild | RollupBuild;
+	result?: RollupSingleFileBuild | RollupBuild;
 }
 
 interface Watcher {
@@ -52,7 +52,7 @@ export default function watch(
 	let watcher: Watcher;
 	let configWatcher: Watcher;
 
-	let processConfigsErr;
+	let processConfigsErr: any;
 
 	function processConfigs(configs: RollupWatchOptions[]): RollupWatchOptions[] {
 		return configs.map(options => {
@@ -116,12 +116,18 @@ export default function watch(
 				case 'BUNDLE_START':
 					if (!silent) {
 						let input = event.input;
-						if ( typeof input !== 'string' ) {
-							input = Array.isArray(input) ? input.join(', ') : Object.values(input).join(', ')
+						if (typeof input !== 'string') {
+							input = Array.isArray(input)
+								? input.join(', ')
+								: Object.keys(input)
+										.map(key => (<Record<string, string>>input)[key])
+										.join(', ');
 						}
 						stderr(
 							chalk.cyan(
-								`bundles ${chalk.bold(input)} → ${chalk.bold(event.output.map(relativeId).join(', '))}...`
+								`bundles ${chalk.bold(input)} → ${chalk.bold(
+									event.output.map(relativeId).join(', ')
+								)}...`
 							)
 						);
 					}
@@ -200,7 +206,7 @@ export default function watch(
 			restarting = true;
 
 			loadConfigFile(configFile, command)
-				.then((configs: RollupWatchOptions[]) => {
+				.then((_configs: RollupWatchOptions[]) => {
 					restarting = false;
 
 					if (aborted) {

diff --git a/src/rollup/index.ts b/src/rollup/index.ts
@@ -19,7 +19,7 @@ import {
 	OutputChunk,
 	OutputBundle,
 	OutputFile,
-	RollupFileBuild,
+	RollupSingleFileBuild,
 	RollupBuild,
 	ChunkDefinition
 } from './types';
@@ -103,7 +103,7 @@ function getInputOptions(rawInputOptions: GenericConfigObject): any {
 
 export default function rollup(
 	rawInputOptions: GenericConfigObject
-): Promise<RollupFileBuild | RollupBuild> {
+): Promise<RollupSingleFileBuild | RollupBuild> {
 	try {
 		const inputOptions = getInputOptions(rawInputOptions);
 		initialiseTimers(inputOptions);
@@ -366,7 +366,7 @@ export default function rollup(
 				}
 
 				const cache = graph.getCache();
-				const result: RollupFileBuild | RollupBuild = {
+				const result: RollupSingleFileBuild | RollupBuild = {
 					cache,
 					generate: <any>((rawOutputOptions: GenericConfigObject) => {
 						const promise = generate(rawOutputOptions, false).then(

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -323,7 +323,7 @@ export interface RollupCache {
 	modules: ModuleJSON[];
 }
 
-export interface RollupFileBuild {
+export interface RollupSingleFileBuild {
 	// TODO: consider deprecating to match code splitting
 	imports: string[];
 	exports: { name: string; originalName: string; moduleId: string }[];
@@ -358,7 +358,7 @@ export interface RollupDirOptions extends InputOptions {
 	output?: OutputOptionsDir;
 }
 
-export function rollup(options: RollupFileOptions): Promise<RollupFileBuild>;
+export function rollup(options: RollupFileOptions): Promise<RollupSingleFileBuild>;
 export function rollup(options: RollupDirOptions): Promise<RollupBuild>;
 
 export interface Watcher extends EventEmitter {}

diff --git a/src/watch/index.ts b/src/watch/index.ts
@@ -5,7 +5,7 @@ import rollup from '../rollup/index';
 import {
 	InputOptions,
 	OutputOptions,
-	RollupFileBuild,
+	RollupSingleFileBuild,
 	RollupBuild,
 	OutputChunk,
 	ModuleJSON,
@@ -209,7 +209,7 @@ export class Task {
 					})
 				).then(() => result);
 			})
-			.then((result: RollupFileBuild | RollupBuild) => {
+			.then((result: RollupSingleFileBuild | RollupBuild) => {
 				this.watcher.emit('event', {
 					code: 'BUNDLE_END',
 					input: this.inputOptions.input,