rollup 3.24.0 → 3.25.0

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.24.0
-	Wed, 07 Jun 2023 04:46:58 GMT - commit bcd64961f92535d2d6d0b663d1e17a500374358b
+	Rollup.js v3.25.0
+	Sun, 11 Jun 2023 05:02:46 GMT - commit 23c111c87145d15b0de032a6c7eeb6596764d1cf
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.d.ts

@@ -1,9 +1,10 @@
-import type { MergedRollupOptions, RollupWarning } from './rollup';
+import type { LogHandler, MergedRollupOptions, RollupLog } from './rollup';
 
 export interface BatchWarnings {
-	add: (warning: RollupWarning) => void;
+	add: (warning: RollupLog) => void;
 	readonly count: number;
 	flush: () => void;
+	log: LogHandler;
 	readonly warningOccurred: boolean;
 }
 
@@ -11,7 +12,8 @@ export type LoadConfigFile = typeof loadConfigFile;
 
 export function loadConfigFile(
 	fileName: string,
-	commandOptions: any
+	commandOptions: any,
+	watchMode?: boolean
 ): Promise<{
 	options: MergedRollupOptions[];
 	warnings: BatchWarnings;

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.24.0
-	Wed, 07 Jun 2023 04:46:58 GMT - commit bcd64961f92535d2d6d0b663d1e17a500374358b
+	Rollup.js v3.25.0
+	Sun, 11 Jun 2023 05:02:46 GMT - commit 23c111c87145d15b0de032a6c7eeb6596764d1cf
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.d.ts

@@ -32,6 +32,7 @@ export interface RollupLog {
 		line: number;
 	};
 	message: string;
+	meta?: any;
 	names?: string[];
 	plugin?: string;
 	pluginCode?: string;
@@ -41,6 +42,9 @@ export interface RollupLog {
 	url?: string;
 }
 
+export type LogLevel = 'warn' | 'info' | 'debug';
+export type LogLevelOption = LogLevel | 'silent';
+
 export type SourceMapSegment =
 	| [number]
 	| [number, number, number, number]
@@ -128,8 +132,14 @@ export interface PluginCache {
 	set<T = any>(id: string, value: T): void;
 }
 
+export type LoggingFunction = (log: RollupLog | string | (() => RollupLog | string)) => void;
+
 export interface MinimalPluginContext {
+	debug: LoggingFunction;
+	error: (error: RollupError | string) => never;
+	info: LoggingFunction;
 	meta: PluginContextMeta;
+	warn: LoggingFunction;
 }
 
 export interface EmittedAsset {
@@ -190,15 +200,22 @@ export interface CustomPluginOptions {
 	[plugin: string]: any;
 }
 
+type LoggingFunctionWithPosition = (
+	log: RollupLog | string | (() => RollupLog | string),
+	pos?: number | { column: number; line: number }
+) => void;
+
 export interface PluginContext extends MinimalPluginContext {
 	addWatchFile: (id: string) => void;
 	cache: PluginCache;
+	debug: LoggingFunction;
 	emitFile: EmitFile;
-	error: (error: RollupError | string, pos?: number | { column: number; line: number }) => never;
+	error: (error: RollupError | string) => never;
 	getFileName: (fileReferenceId: string) => string;
 	getModuleIds: () => IterableIterator<string>;
 	getModuleInfo: GetModuleInfo;
 	getWatchFiles: () => string[];
+	info: LoggingFunction;
 	load: (
 		options: { id: string; resolveDependencies?: boolean } & Partial<PartialNull<ModuleOptions>>
 	) => Promise<ModuleInfo>;
@@ -216,7 +233,7 @@ export interface PluginContext extends MinimalPluginContext {
 		}
 	) => Promise<ResolvedId | null>;
 	setAssetSource: (assetReferenceId: string, source: string | Uint8Array) => void;
-	warn: (warning: RollupWarning | string, pos?: number | { column: number; line: number }) => void;
+	warn: LoggingFunction;
 }
 
 export interface PluginContextMeta {
@@ -279,7 +296,11 @@ export type LoadResult = SourceDescription | string | NullValue;
 export type LoadHook = (this: PluginContext, id: string) => LoadResult;
 
 export interface TransformPluginContext extends PluginContext {
+	debug: LoggingFunctionWithPosition;
+	error: (error: RollupError | string, pos?: number | { column: number; line: number }) => never;
 	getCombinedSourcemap: () => SourceMap;
+	info: LoggingFunctionWithPosition;
+	warn: LoggingFunctionWithPosition;
 }
 
 export type TransformResult = string | NullValue | Partial<SourceDescription>;
@@ -369,6 +390,7 @@ export interface FunctionPluginHooks {
 	) => void;
 	load: LoadHook;
 	moduleParsed: ModuleParsedHook;
+	onLog: (this: MinimalPluginContext, level: LogLevel, log: RollupLog) => boolean | NullValue;
 	options: (this: MinimalPluginContext, options: InputOptions) => InputOptions | NullValue;
 	outputOptions: (this: PluginContext, options: OutputOptions) => OutputOptions | NullValue;
 	renderChunk: RenderChunkHook;
@@ -417,6 +439,7 @@ export type InputPluginHooks = Exclude<keyof FunctionPluginHooks, OutputPluginHo
 
 export type SyncPluginHooks =
 	| 'augmentChunkHash'
+	| 'onLog'
 	| 'outputOptions'
 	| 'renderDynamicImport'
 	| 'resolveFileUrl'
@@ -436,6 +459,7 @@ export type FirstPluginHooks =
 export type SequentialPluginHooks =
 	| 'augmentChunkHash'
 	| 'generateBundle'
+	| 'onLog'
 	| 'options'
 	| 'outputOptions'
 	| 'renderChunk'
@@ -508,16 +532,32 @@ export type ExternalOption =
 	| string
 	| RegExp
 	| ((source: string, importer: string | undefined, isResolved: boolean) => boolean | NullValue);
-export type PureModulesOption = boolean | string[] | IsPureModule;
+
 export type GlobalsOption = { [name: string]: string } | ((name: string) => string);
+
 export type InputOption = string | string[] | { [entryAlias: string]: string };
+
 export type ManualChunksOption = { [chunkAlias: string]: string[] } | GetManualChunk;
+
+export type LogHandlerWithDefault = (
+	level: LogLevel,
+	log: RollupLog,
+	defaultHandler: LogOrStringHandler
+) => void;
+
+export type LogOrStringHandler = (level: LogLevel | 'error', log: RollupLog | string) => void;
+
+export type LogHandler = (level: LogLevel, log: RollupLog) => void;
+
 export type ModuleSideEffectsOption = boolean | 'no-external' | string[] | HasModuleSideEffects;
+
 export type PreserveEntrySignaturesOption = false | 'strict' | 'allow-extension' | 'exports-only';
+
 export type SourcemapPathTransformOption = (
 	relativeSourcePath: string,
 	sourcemapPath: string
 ) => string;
+
 export type SourcemapIgnoreListOption = (
 	relativeSourcePath: string,
 	sourcemapPath: string
@@ -536,6 +576,7 @@ export interface InputOptions {
 	/** @deprecated Use the "inlineDynamicImports" output option instead. */
 	inlineDynamicImports?: boolean;
 	input?: InputOption;
+	logLevel?: LogLevelOption;
 	makeAbsoluteExternalsRelative?: boolean | 'ifRelativeSource';
 	/** @deprecated Use the "manualChunks" output option instead. */
 	manualChunks?: ManualChunksOption;
@@ -543,6 +584,7 @@ export interface InputOptions {
 	/** @deprecated Use the "maxParallelFileOps" option instead. */
 	maxParallelFileReads?: number;
 	moduleContext?: ((id: string) => string | NullValue) | { [id: string]: string };
+	onLog?: LogHandlerWithDefault;
 	onwarn?: WarningHandlerWithDefault;
 	perf?: boolean;
 	plugins?: InputPluginOption;
@@ -571,6 +613,7 @@ export interface NormalizedInputOptions {
 	/** @deprecated Use the "inlineDynamicImports" output option instead. */
 	inlineDynamicImports: boolean | undefined;
 	input: string[] | { [entryAlias: string]: string };
+	logLevel: LogLevelOption;
 	makeAbsoluteExternalsRelative: boolean | 'ifRelativeSource';
 	/** @deprecated Use the "manualChunks" output option instead. */
 	manualChunks: ManualChunksOption | undefined;
@@ -578,7 +621,8 @@ export interface NormalizedInputOptions {
 	/** @deprecated Use the "maxParallelFileOps" option instead. */
 	maxParallelFileReads: number;
 	moduleContext: (id: string) => string;
-	onwarn: WarningHandler;
+	onLog: LogHandler;
+	onwarn: (warning: RollupLog) => void;
 	perf: boolean;
 	plugins: Plugin[];
 	preserveEntrySignatures: PreserveEntrySignaturesOption;
@@ -764,10 +808,9 @@ export interface NormalizedOutputOptions {
 }
 
 export type WarningHandlerWithDefault = (
-	warning: RollupWarning,
-	defaultHandler: WarningHandler
+	warning: RollupLog,
+	defaultHandler: LoggingFunction
 ) => void;
-export type WarningHandler = (warning: RollupWarning) => void;
 
 export interface SerializedTimings {
 	[label: string]: [number, number, number];

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.24.0
-	Wed, 07 Jun 2023 04:46:58 GMT - commit bcd64961f92535d2d6d0b663d1e17a500374358b
+	Rollup.js v3.25.0
+	Sun, 11 Jun 2023 05:02:46 GMT - commit 23c111c87145d15b0de032a6c7eeb6596764d1cf
 
 	https://github.com/rollup/rollup
 

package/dist/shared/fsevents-importer.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.24.0
-	Wed, 07 Jun 2023 04:46:58 GMT - commit bcd64961f92535d2d6d0b663d1e17a500374358b
+	Rollup.js v3.25.0
+	Sun, 11 Jun 2023 05:02:46 GMT - commit 23c111c87145d15b0de032a6c7eeb6596764d1cf
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.24.0
-	Wed, 07 Jun 2023 04:46:58 GMT - commit bcd64961f92535d2d6d0b663d1e17a500374358b
+	Rollup.js v3.25.0
+	Sun, 11 Jun 2023 05:02:46 GMT - commit 23c111c87145d15b0de032a6c7eeb6596764d1cf
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.24.0
-	Wed, 07 Jun 2023 04:46:58 GMT - commit bcd64961f92535d2d6d0b663d1e17a500374358b
+	Rollup.js v3.25.0
+	Sun, 11 Jun 2023 05:02:46 GMT - commit 23c111c87145d15b0de032a6c7eeb6596764d1cf
 
 	https://github.com/rollup/rollup
 
@@ -15,40 +15,33 @@ const process = require('node:process');
 const node_url = require('node:url');
 const rollup = require('./rollup.js');
 
-function batchWarnings() {
+function batchWarnings(silent) {
     let count = 0;
     const deferredWarnings = new Map();
     let warningOccurred = false;
+    const add = (warning) => {
+        count += 1;
+        warningOccurred = true;
+        if (silent)
+            return;
+        if (warning.code in deferredHandlers) {
+            rollup.getOrCreate(deferredWarnings, warning.code, rollup.getNewArray).push(warning);
+        }
+        else if (warning.code in immediateHandlers) {
+            immediateHandlers[warning.code](warning);
+        }
+        else {
+            title(warning.message);
+            defaultBody(warning);
+        }
+    };
     return {
-        add(warning) {
-            count += 1;
-            warningOccurred = true;
-            if (warning.code in deferredHandlers) {
-                rollup.getOrCreate(deferredWarnings, warning.code, rollup.getNewArray).push(warning);
-            }
-            else if (warning.code in immediateHandlers) {
-                immediateHandlers[warning.code](warning);
-            }
-            else {
-                title(warning.message);
-                if (warning.url)
-                    info(warning.url);
-                const id = warning.loc?.file || warning.id;
-                if (id) {
-                    const loc = warning.loc
-                        ? `${rollup.relativeId(id)} (${warning.loc.line}:${warning.loc.column})`
-                        : rollup.relativeId(id);
-                    rollup.stderr(rollup.bold(rollup.relativeId(loc)));
-                }
-                if (warning.frame)
-                    info(warning.frame);
-            }
-        },
+        add,
         get count() {
             return count;
         },
         flush() {
-            if (count === 0)
+            if (count === 0 || silent)
                 return;
             const codes = [...deferredWarnings.keys()].sort((a, b) => deferredWarnings.get(b).length - deferredWarnings.get(a).length);
             for (const code of codes) {
@@ -57,6 +50,26 @@ function batchWarnings() {
             deferredWarnings.clear();
             count = 0;
         },
+        log(level, log) {
+            switch (level) {
+                case rollup.LOGLEVEL_WARN: {
+                    return add(log);
+                }
+                case rollup.LOGLEVEL_DEBUG: {
+                    if (!silent) {
+                        rollup.stderr(rollup.bold(rollup.blue(log.message)));
+                        defaultBody(log);
+                    }
+                    return;
+                }
+                default: {
+                    if (!silent) {
+                        rollup.stderr(rollup.bold(rollup.cyan(log.message)));
+                        defaultBody(log);
+                    }
+                }
+            }
+        },
         get warningOccurred() {
             return warningOccurred;
         }
@@ -187,6 +200,18 @@ const deferredHandlers = {
         }
     }
 };
+function defaultBody(log) {
+    if (log.url) {
+        info(rollup.getRollupUrl(log.url));
+    }
+    const id = log.loc?.file || log.id;
+    if (id) {
+        const loc = log.loc ? `${rollup.relativeId(id)} (${log.loc.line}:${log.loc.column})` : rollup.relativeId(id);
+        rollup.stderr(rollup.bold(rollup.relativeId(loc)));
+    }
+    if (log.frame)
+        info(log.frame);
+}
 function title(string_) {
     rollup.stderr(rollup.bold(rollup.yellow(`(!) ${string_}`)));
 }
@@ -387,13 +412,13 @@ async function requireOrImport(pluginPath) {
     }
 }
 
-const loadConfigFile = async (fileName, commandOptions = {}) => {
-    const configs = await getConfigList(getDefaultFromCjs(await getConfigFileExport(fileName, commandOptions)), commandOptions);
-    const warnings = batchWarnings();
+const loadConfigFile = async (fileName, commandOptions = {}, watchMode = false) => {
+    const configs = await getConfigList(getDefaultFromCjs(await getConfigFileExport(fileName, commandOptions, watchMode)), commandOptions);
+    const warnings = batchWarnings(commandOptions.silent);
     try {
         const normalizedConfigs = [];
         for (const config of configs) {
-            const options = await rollup.mergeOptions(config, commandOptions, warnings.add);
+            const options = await rollup.mergeOptions(config, watchMode, commandOptions, warnings.log);
             await addCommandPluginsToInputOptions(options, commandOptions);
             normalizedConfigs.push(options);
         }
@@ -404,14 +429,14 @@ const loadConfigFile = async (fileName, commandOptions = {}) => {
         throw error_;
     }
 };
-async function getConfigFileExport(fileName, commandOptions) {
+async function getConfigFileExport(fileName, commandOptions, watchMode) {
     if (commandOptions.configPlugin || commandOptions.bundleConfigAsCjs) {
         try {
             return await loadTranspiledConfigFile(fileName, commandOptions);
         }
         catch (error_) {
             if (error_.message.includes('not defined in ES module scope')) {
-                return rollup.error(rollup.errorCannotBundleConfigAsEsm(error_));
+                return rollup.error(rollup.logCannotBundleConfigAsEsm(error_));
             }
             throw error_;
         }
@@ -425,7 +450,7 @@ async function getConfigFileExport(fileName, commandOptions) {
     process.on('warning', handleWarning);
     try {
         const fileUrl = node_url.pathToFileURL(fileName);
-        if (process.env.ROLLUP_WATCH) {
+        if (watchMode) {
             // We are adding the current date to allow reloads in watch mode
             fileUrl.search = `?${Date.now()}`;
         }
@@ -433,10 +458,10 @@ async function getConfigFileExport(fileName, commandOptions) {
     }
     catch (error_) {
         if (cannotLoadEsm) {
-            return rollup.error(rollup.errorCannotLoadConfigAsCjs(error_));
+            return rollup.error(rollup.logCannotLoadConfigAsCjs(error_));
         }
         if (error_.message.includes('not defined in ES module scope')) {
-            return rollup.error(rollup.errorCannotLoadConfigAsEsm(error_));
+            return rollup.error(rollup.logCannotLoadConfigAsEsm(error_));
         }
         throw error_;
     }
@@ -448,7 +473,7 @@ function getDefaultFromCjs(namespace) {
     return namespace.default || namespace;
 }
 async function loadTranspiledConfigFile(fileName, { bundleConfigAsCjs, configPlugin, silent }) {
-    const warnings = batchWarnings();
+    const warnings = batchWarnings(!!silent);
     const inputOptions = {
         external: (id) => (id[0] !== '.' && !node_path.isAbsolute(id)) || id.slice(-5, id.length) === '.json',
         input: fileName,
@@ -458,10 +483,6 @@ async function loadTranspiledConfigFile(fileName, { bundleConfigAsCjs, configPlu
     };
     await addPluginsFromCommandOption(configPlugin, inputOptions);
     const bundle = await rollup.rollup(inputOptions);
-    if (!silent && warnings.count > 0) {
-        rollup.stderr(rollup.bold(`loaded ${rollup.relativeId(fileName)} with warnings`));
-        warnings.flush();
-    }
     const { output: [{ code }] } = await bundle.generate({
         exports: 'named',
         format: bundleConfigAsCjs ? 'cjs' : 'es',
@@ -479,6 +500,10 @@ async function loadTranspiledConfigFile(fileName, { bundleConfigAsCjs, configPlu
             }
         ]
     });
+    if (!silent && warnings.count > 0) {
+        rollup.stderr(rollup.bold(`loaded ${rollup.relativeId(fileName)} with warnings`));
+        warnings.flush();
+    }
     return loadConfigFromWrittenFile(node_path.join(node_path.dirname(fileName), `rollup.config-${Date.now()}.${bundleConfigAsCjs ? 'cjs' : 'mjs'}`), code);
 }
 async function loadConfigFromWrittenFile(bundledFileName, bundledCode) {
@@ -496,7 +521,7 @@ async function getConfigList(configFileExport, commandOptions) {
         ? configFileExport(commandOptions)
         : configFileExport);
     if (Object.keys(config).length === 0) {
-        return rollup.error(rollup.errorMissingConfig());
+        return rollup.error(rollup.logMissingConfig());
     }
     return Array.isArray(config) ? config : [config];
 }