rollup 2.69.2 → 2.70.2

package/dist/rollup.d.ts

@@ -237,7 +237,7 @@ interface PartialResolvedId extends Partial<PartialNull<ModuleOptions>> {
 	id: string;
 }
 
-export type ResolveIdResult = string | false | null | undefined | PartialResolvedId;
+export type ResolveIdResult = string | false | null | void | PartialResolvedId;
 
 export type ResolveIdHook = (
 	this: PluginContext,
@@ -265,11 +265,11 @@ export type IsExternal = (
 	isResolved: boolean
 ) => boolean;
 
-export type IsPureModule = (id: string) => boolean | null | undefined;
+export type IsPureModule = (id: string) => boolean | null | void;
 
 export type HasModuleSideEffects = (id: string, external: boolean) => boolean;
 
-type LoadResult = SourceDescription | string | null | undefined;
+type LoadResult = SourceDescription | string | null | void;
 
 export type LoadHook = (this: PluginContext, id: string) => Promise<LoadResult> | LoadResult;
 
@@ -277,7 +277,7 @@ export interface TransformPluginContext extends PluginContext {
 	getCombinedSourcemap: () => SourceMap;
 }
 
-export type TransformResult = string | null | undefined | Partial<SourceDescription>;
+export type TransformResult = string | null | void | Partial<SourceDescription>;
 
 export type TransformHook = (
 	this: TransformPluginContext,
@@ -309,7 +309,7 @@ export type ResolveImportMetaHook = (
 	this: PluginContext,
 	prop: string | null,
 	options: { chunkId: string; format: InternalModuleFormat; moduleId: string }
-) => string | null | undefined;
+) => string | null | void;
 
 export type ResolveAssetUrlHook = (
 	this: PluginContext,
@@ -320,7 +320,7 @@ export type ResolveAssetUrlHook = (
 		moduleId: string;
 		relativeAssetPath: string;
 	}
-) => string | null | undefined;
+) => string | null | void;
 
 export type ResolveFileUrlHook = (
 	this: PluginContext,
@@ -334,7 +334,7 @@ export type ResolveFileUrlHook = (
 		referenceId: string;
 		relativePath: string;
 	}
-) => string | null | undefined;
+) => string | null | void;
 
 export type AddonHookFunction = (this: PluginContext) => string | Promise<string>;
 export type AddonHook = string | AddonHookFunction;
@@ -344,7 +344,7 @@ export type WatchChangeHook = (
 	this: PluginContext,
 	id: string,
 	change: { event: ChangeEvent }
-) => void;
+) => Promise<void> | void;
 
 /**
  * use this type for plugin annotation
@@ -375,13 +375,13 @@ export interface PluginHooks extends OutputPluginHooks {
 	buildEnd: (this: PluginContext, err?: Error) => Promise<void> | void;
 	buildStart: (this: PluginContext, options: NormalizedInputOptions) => Promise<void> | void;
 	closeBundle: (this: PluginContext) => Promise<void> | void;
-	closeWatcher: (this: PluginContext) => void;
+	closeWatcher: (this: PluginContext) => Promise<void> | void;
 	load: LoadHook;
 	moduleParsed: ModuleParsedHook;
 	options: (
 		this: MinimalPluginContext,
 		options: InputOptions
-	) => Promise<InputOptions | null | undefined> | InputOptions | null | undefined;
+	) => Promise<InputOptions | null | void> | InputOptions | null | void;
 	resolveDynamicImport: ResolveDynamicImportHook;
 	resolveId: ResolveIdHook;
 	shouldTransformCachedModule: ShouldTransformCachedModuleHook;
@@ -397,7 +397,7 @@ interface OutputPluginHooks {
 		bundle: OutputBundle,
 		isWrite: boolean
 	) => void | Promise<void>;
-	outputOptions: (this: PluginContext, options: OutputOptions) => OutputOptions | null | undefined;
+	outputOptions: (this: PluginContext, options: OutputOptions) => OutputOptions | null | void;
 	renderChunk: RenderChunkHook;
 	renderDynamicImport: (
 		this: PluginContext,
@@ -407,7 +407,7 @@ interface OutputPluginHooks {
 			moduleId: string;
 			targetModuleId: string | null;
 		}
-	) => { left: string; right: string } | null | undefined;
+	) => { left: string; right: string } | null | void;
 	renderError: (this: PluginContext, err?: Error) => Promise<void> | void;
 	renderStart: (
 		this: PluginContext,
@@ -440,7 +440,9 @@ export type AsyncPluginHooks =
 	| 'shouldTransformCachedModule'
 	| 'transform'
 	| 'writeBundle'
-	| 'closeBundle';
+	| 'closeBundle'
+	| 'closeWatcher'
+	| 'watchChange';
 
 export type PluginValueHooks = 'banner' | 'footer' | 'intro' | 'outro';
 
@@ -458,13 +460,11 @@ export type FirstPluginHooks =
 
 export type SequentialPluginHooks =
 	| 'augmentChunkHash'
-	| 'closeWatcher'
 	| 'generateBundle'
 	| 'options'
 	| 'outputOptions'
 	| 'renderChunk'
-	| 'transform'
-	| 'watchChange';
+	| 'transform';
 
 export type ParallelPluginHooks =
 	| 'banner'
@@ -477,7 +477,9 @@ export type ParallelPluginHooks =
 	| 'renderError'
 	| 'renderStart'
 	| 'writeBundle'
-	| 'closeBundle';
+	| 'closeBundle'
+	| 'closeWatcher'
+	| 'watchChange';
 
 interface OutputPluginValueHooks {
 	banner: AddonHook;
@@ -520,17 +522,13 @@ interface GetManualChunkApi {
 	getModuleIds: () => IterableIterator<string>;
 	getModuleInfo: GetModuleInfo;
 }
-export type GetManualChunk = (id: string, api: GetManualChunkApi) => string | null | undefined;
+export type GetManualChunk = (id: string, api: GetManualChunkApi) => string | null | void;
 
 export type ExternalOption =
 	| (string | RegExp)[]
 	| string
 	| RegExp
-	| ((
-			source: string,
-			importer: string | undefined,
-			isResolved: boolean
-	  ) => boolean | null | undefined);
+	| ((source: string, importer: string | undefined, isResolved: boolean) => boolean | null | void);
 export type PureModulesOption = boolean | string[] | IsPureModule;
 export type GlobalsOption = { [name: string]: string } | ((name: string) => string);
 export type InputOption = string | string[] | { [entryAlias: string]: string };
@@ -556,7 +554,7 @@ export interface InputOptions {
 	/** @deprecated Use the "manualChunks" output option instead. */
 	manualChunks?: ManualChunksOption;
 	maxParallelFileReads?: number;
-	moduleContext?: ((id: string) => string | null | undefined) | { [id: string]: string };
+	moduleContext?: ((id: string) => string | null | void) | { [id: string]: string };
 	onwarn?: WarningHandlerWithDefault;
 	perf?: boolean;
 	plugins?: (Plugin | null | false | undefined)[];
@@ -898,6 +896,24 @@ interface TypedEventEmitter<T extends { [event: string]: (...args: any) => any }
 	setMaxListeners(n: number): this;
 }
 
+export interface RollupAwaitingEmitter<T extends { [event: string]: (...args: any) => any }>
+	extends TypedEventEmitter<T> {
+	close(): Promise<void>;
+	emitAndAwait<K extends keyof T>(event: K, ...args: Parameters<T[K]>): Promise<ReturnType<T[K]>[]>;
+	/**
+	 * Registers an event listener that will be awaited before Rollup continues
+	 * for events emitted via emitAndAwait. All listeners will be awaited in
+	 * parallel while rejections are tracked via Promise.all.
+	 * Listeners are removed automatically when removeAwaited is called, which
+	 * happens automatically after each run.
+	 */
+	onCurrentAwaited<K extends keyof T>(
+		event: K,
+		listener: (...args: Parameters<T[K]>) => Promise<ReturnType<T[K]>>
+	): this;
+	removeAwaited(): this;
+}
+
 export type RollupWatcherEvent =
 	| { code: 'START' }
 	| { code: 'BUNDLE_START'; input?: InputOption; output: readonly string[] }
@@ -911,15 +927,12 @@ export type RollupWatcherEvent =
 	| { code: 'END' }
 	| { code: 'ERROR'; error: RollupError; result: RollupBuild | null };
 
-export interface RollupWatcher
-	extends TypedEventEmitter<{
-		change: (id: string, change: { event: ChangeEvent }) => void;
-		close: () => void;
-		event: (event: RollupWatcherEvent) => void;
-		restart: () => void;
-	}> {
-	close(): void;
-}
+export type RollupWatcher = RollupAwaitingEmitter<{
+	change: (id: string, change: { event: ChangeEvent }) => void;
+	close: () => void;
+	event: (event: RollupWatcherEvent) => void;
+	restart: () => void;
+}>;
 
 export function watch(config: RollupWatchOptions | RollupWatchOptions[]): RollupWatcher;
 

package/dist/rollup.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.2
+	Fri, 15 Apr 2022 05:14:21 GMT - commit 030c56fd6b186a0ddfd57d143ad703f34fd2c17a
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.2
+	Fri, 15 Apr 2022 05:14:21 GMT - commit 030c56fd6b186a0ddfd57d143ad703f34fd2c17a
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.2
+	Fri, 15 Apr 2022 05:14:21 GMT - commit 030c56fd6b186a0ddfd57d143ad703f34fd2c17a
 
 	https://github.com/rollup/rollup
 

package/dist/shared/mergeOptions.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.2
+	Fri, 15 Apr 2022 05:14:21 GMT - commit 030c56fd6b186a0ddfd57d143ad703f34fd2c17a
 
 	https://github.com/rollup/rollup