rollup 3.1.0 → 3.2.1

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.1.0
-	Wed, 12 Oct 2022 08:54:50 GMT - commit f7b768992209a970c240799cdff12a4fa437c0d4
+	Rollup.js v3.2.1
+	Sun, 16 Oct 2022 04:44:52 GMT - commit 46e1eaaaf05e0c2efa0ed395d7a3cfa99ef25fb5
 
 	https://github.com/rollup/rollup
 
@@ -9,7 +9,7 @@
 */
 import { resolve } from 'node:path';
 import process$1 from 'node:process';
-import { ensureArray, warnUnknownOptions, defaultOnWarn, normalizePluginOption, objectifyOptionWithPresets, treeshakePresets, objectifyOption, generatedCodePresets, picomatch as picomatch$2, getAugmentedNamespace, fseventsImporter, createFilter, rollupInternal } from './rollup.js';
+import { picomatch as picomatch$2, getAugmentedNamespace, fseventsImporter, createFilter, rollupInternal } from './rollup.js';
 import { platform } from 'node:os';
 import require$$0$1 from 'fs';
 import require$$2 from 'util';
@@ -21,165 +21,7 @@ import 'node:perf_hooks';
 import 'node:crypto';
 import 'node:fs';
 import 'node:events';
-
-const commandAliases = {
-    c: 'config',
-    d: 'dir',
-    e: 'external',
-    f: 'format',
-    g: 'globals',
-    h: 'help',
-    i: 'input',
-    m: 'sourcemap',
-    n: 'name',
-    o: 'file',
-    p: 'plugin',
-    v: 'version',
-    w: 'watch'
-};
-function mergeOptions(config, rawCommandOptions = { external: [], globals: undefined }, defaultOnWarnHandler = defaultOnWarn) {
-    const command = getCommandOptions(rawCommandOptions);
-    const inputOptions = mergeInputOptions(config, command, defaultOnWarnHandler);
-    const warn = inputOptions.onwarn;
-    if (command.output) {
-        Object.assign(command, command.output);
-    }
-    const outputOptionsArray = ensureArray(config.output);
-    if (outputOptionsArray.length === 0)
-        outputOptionsArray.push({});
-    const outputOptions = outputOptionsArray.map(singleOutputOptions => mergeOutputOptions(singleOutputOptions, command, warn));
-    warnUnknownOptions(command, Object.keys(inputOptions).concat(Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'), Object.keys(commandAliases), 'bundleConfigAsCjs', 'config', 'environment', 'plugin', 'silent', 'failAfterWarnings', 'stdin', 'waitForBundleInput', 'configPlugin'), 'CLI flags', warn, /^_$|output$|config/);
-    inputOptions.output = outputOptions;
-    return inputOptions;
-}
-function getCommandOptions(rawCommandOptions) {
-    const external = rawCommandOptions.external && typeof rawCommandOptions.external === 'string'
-        ? rawCommandOptions.external.split(',')
-        : [];
-    return {
-        ...rawCommandOptions,
-        external,
-        globals: typeof rawCommandOptions.globals === 'string'
-            ? rawCommandOptions.globals.split(',').reduce((globals, globalDefinition) => {
-                const [id, variableName] = globalDefinition.split(':');
-                globals[id] = variableName;
-                if (!external.includes(id)) {
-                    external.push(id);
-                }
-                return globals;
-            }, Object.create(null))
-            : undefined
-    };
-}
-function mergeInputOptions(config, overrides, defaultOnWarnHandler) {
-    const getOption = (name) => overrides[name] ?? config[name];
-    const inputOptions = {
-        acorn: getOption('acorn'),
-        acornInjectPlugins: config.acornInjectPlugins,
-        cache: config.cache,
-        context: getOption('context'),
-        experimentalCacheExpiry: getOption('experimentalCacheExpiry'),
-        external: getExternal(config, overrides),
-        inlineDynamicImports: getOption('inlineDynamicImports'),
-        input: getOption('input') || [],
-        makeAbsoluteExternalsRelative: getOption('makeAbsoluteExternalsRelative'),
-        manualChunks: getOption('manualChunks'),
-        maxParallelFileOps: getOption('maxParallelFileOps'),
-        maxParallelFileReads: getOption('maxParallelFileReads'),
-        moduleContext: getOption('moduleContext'),
-        onwarn: getOnWarn(config, defaultOnWarnHandler),
-        perf: getOption('perf'),
-        plugins: normalizePluginOption(config.plugins),
-        preserveEntrySignatures: getOption('preserveEntrySignatures'),
-        preserveModules: getOption('preserveModules'),
-        preserveSymlinks: getOption('preserveSymlinks'),
-        shimMissingExports: getOption('shimMissingExports'),
-        strictDeprecations: getOption('strictDeprecations'),
-        treeshake: getObjectOption(config, overrides, 'treeshake', objectifyOptionWithPresets(treeshakePresets, 'treeshake', 'false, true, ')),
-        watch: getWatch(config, overrides)
-    };
-    warnUnknownOptions(config, Object.keys(inputOptions), 'input options', inputOptions.onwarn, /^output$/);
-    return inputOptions;
-}
-const getExternal = (config, overrides) => {
-    const configExternal = config.external;
-    return typeof configExternal === 'function'
-        ? (source, importer, isResolved) => configExternal(source, importer, isResolved) || overrides.external.includes(source)
-        : ensureArray(configExternal).concat(overrides.external);
-};
-const getOnWarn = (config, defaultOnWarnHandler) => config.onwarn
-    ? warning => config.onwarn(warning, defaultOnWarnHandler)
-    : defaultOnWarnHandler;
-const getObjectOption = (config, overrides, name, objectifyValue = objectifyOption) => {
-    const commandOption = normalizeObjectOptionValue(overrides[name], objectifyValue);
-    const configOption = normalizeObjectOptionValue(config[name], objectifyValue);
-    if (commandOption !== undefined) {
-        return commandOption && { ...configOption, ...commandOption };
-    }
-    return configOption;
-};
-const getWatch = (config, overrides) => config.watch !== false && getObjectOption(config, overrides, 'watch');
-const normalizeObjectOptionValue = (optionValue, objectifyValue) => {
-    if (!optionValue) {
-        return optionValue;
-    }
-    if (Array.isArray(optionValue)) {
-        return optionValue.reduce((result, value) => value && result && { ...result, ...objectifyValue(value) }, {});
-    }
-    return objectifyValue(optionValue);
-};
-function mergeOutputOptions(config, overrides, warn) {
-    const getOption = (name) => overrides[name] ?? config[name];
-    const outputOptions = {
-        amd: getObjectOption(config, overrides, 'amd'),
-        assetFileNames: getOption('assetFileNames'),
-        banner: getOption('banner'),
-        chunkFileNames: getOption('chunkFileNames'),
-        compact: getOption('compact'),
-        dir: getOption('dir'),
-        dynamicImportFunction: getOption('dynamicImportFunction'),
-        dynamicImportInCjs: getOption('dynamicImportInCjs'),
-        entryFileNames: getOption('entryFileNames'),
-        esModule: getOption('esModule'),
-        exports: getOption('exports'),
-        extend: getOption('extend'),
-        externalImportAssertions: getOption('externalImportAssertions'),
-        externalLiveBindings: getOption('externalLiveBindings'),
-        file: getOption('file'),
-        footer: getOption('footer'),
-        format: getOption('format'),
-        freeze: getOption('freeze'),
-        generatedCode: getObjectOption(config, overrides, 'generatedCode', objectifyOptionWithPresets(generatedCodePresets, 'output.generatedCode', '')),
-        globals: getOption('globals'),
-        hoistTransitiveImports: getOption('hoistTransitiveImports'),
-        indent: getOption('indent'),
-        inlineDynamicImports: getOption('inlineDynamicImports'),
-        interop: getOption('interop'),
-        intro: getOption('intro'),
-        manualChunks: getOption('manualChunks'),
-        minifyInternalExports: getOption('minifyInternalExports'),
-        name: getOption('name'),
-        namespaceToStringTag: getOption('namespaceToStringTag'),
-        noConflict: getOption('noConflict'),
-        outro: getOption('outro'),
-        paths: getOption('paths'),
-        plugins: normalizePluginOption(config.plugins),
-        preferConst: getOption('preferConst'),
-        preserveModules: getOption('preserveModules'),
-        preserveModulesRoot: getOption('preserveModulesRoot'),
-        sanitizeFileName: getOption('sanitizeFileName'),
-        sourcemap: getOption('sourcemap'),
-        sourcemapBaseUrl: getOption('sourcemapBaseUrl'),
-        sourcemapExcludeSources: getOption('sourcemapExcludeSources'),
-        sourcemapFile: getOption('sourcemapFile'),
-        sourcemapPathTransform: getOption('sourcemapPathTransform'),
-        strict: getOption('strict'),
-        systemNullSetters: getOption('systemNullSetters'),
-        validate: getOption('validate')
-    };
-    warnUnknownOptions(config, Object.keys(outputOptions), 'output options', warn);
-    return outputOptions;
-}
+import 'tty';
 
 var chokidar = {};
 
@@ -2869,7 +2711,7 @@ const setFsWatchFileListener = (path, fullPath, options, handlers) => {
 /**
  * @mixin
  */
-class NodeFsHandler$1 {
+let NodeFsHandler$1 = class NodeFsHandler {
 
 /**
  * @param {import("../index").FSWatcher} fsW
@@ -3225,7 +3067,7 @@ async _addToNodeFs(path, initialAdd, priorWh, depth, target) {
   }
 }
 
-}
+};
 
 var nodefsHandler = NodeFsHandler$1;
 
@@ -3445,7 +3287,7 @@ const sameTypes = (info, stats) => (
 /**
  * @mixin
  */
-class FsEventsHandler$1 {
+let FsEventsHandler$1 = class FsEventsHandler {
 
 /**
  * @param {import('../index').FSWatcher} fsw
@@ -3751,7 +3593,7 @@ async _addToFsEvents(path, transform, forceAdd, priorDepth) {
   }
 }
 
-}
+};
 
 fseventsHandler.exports = FsEventsHandler$1;
 fseventsHandler.exports.canUse = canUse;
@@ -4801,7 +4643,7 @@ const eventsRewrites = {
     }
 };
 class Watcher {
-    constructor(configs, emitter) {
+    constructor(optionsList, emitter) {
         this.buildDelay = 0;
         this.buildTimeout = null;
         this.closed = false;
@@ -4810,10 +4652,12 @@ class Watcher {
         this.running = true;
         this.emitter = emitter;
         emitter.close = this.close.bind(this);
-        this.tasks = configs.map(config => new Task(this, config));
-        this.buildDelay = configs.reduce((buildDelay, { watch }) => watch && typeof watch.buildDelay === 'number'
-            ? Math.max(buildDelay, watch.buildDelay)
-            : buildDelay, this.buildDelay);
+        this.tasks = optionsList.map(options => new Task(this, options));
+        for (const { watch } of optionsList) {
+            if (watch && typeof watch.buildDelay === 'number') {
+                this.buildDelay = Math.max(this.buildDelay, watch.buildDelay);
+            }
+        }
         process$1.nextTick(() => this.run());
     }
     async close() {
@@ -4830,8 +4674,8 @@ class Watcher {
     }
     invalidate(file) {
         if (file) {
-            const prevEvent = this.invalidatedIds.get(file.id);
-            const event = prevEvent ? eventsRewrites[prevEvent][file.event] : file.event;
+            const previousEvent = this.invalidatedIds.get(file.id);
+            const event = previousEvent ? eventsRewrites[previousEvent][file.event] : file.event;
             if (event === 'buggy') {
                 //TODO: throws or warn? Currently just ignore, uses new event
                 this.invalidatedIds.set(file.id, file.event);
@@ -4890,15 +4734,15 @@ class Watcher {
     }
 }
 class Task {
-    constructor(watcher, config) {
+    constructor(watcher, options) {
         this.cache = { modules: [] };
         this.watchFiles = [];
         this.closed = false;
         this.invalidated = true;
         this.watched = new Set();
         this.watcher = watcher;
-        this.skipWrite = Boolean(config.watch && config.watch.skipWrite);
-        this.options = mergeOptions(config);
+        this.options = options;
+        this.skipWrite = Boolean(options.watch && options.watch.skipWrite);
         this.outputs = this.options.output;
         this.outputFiles = this.outputs.map(output => {
             if (output.file || output.dir)
@@ -5000,7 +4844,7 @@ class Task {
         if (!this.filter(id))
             return;
         this.watched.add(id);
-        if (this.outputFiles.some(file => file === id)) {
+        if (this.outputFiles.includes(id)) {
             throw new Error('Cannot import the generated bundle');
         }
         // this is necessary to ensure that any 'renamed' files

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.1.0
-	Wed, 12 Oct 2022 08:54:50 GMT - commit f7b768992209a970c240799cdff12a4fa437c0d4
+	Rollup.js v3.2.1
+	Sun, 16 Oct 2022 04:44:52 GMT - commit 46e1eaaaf05e0c2efa0ed395d7a3cfa99ef25fb5
 
 	https://github.com/rollup/rollup
 
@@ -15,14 +15,13 @@ require('node:fs');
 require('node:path');
 require('node:process');
 require('node:url');
-const loadConfigFile_js = require('./shared/loadConfigFile.js');
 require('./shared/rollup.js');
-require('./shared/mergeOptions.js');
-require('tty');
+const loadConfigFile_js = require('./shared/loadConfigFile.js');
 require('path');
 require('node:perf_hooks');
 require('node:crypto');
 require('node:events');
+require('tty');
 
 
 

package/dist/rollup.d.ts

@@ -1,5 +1,9 @@
 export const VERSION: string;
 
+type FalsyValue = false | null | undefined;
+type MaybeArray<T> = T | T[];
+type MaybePromise<T> = T | Promise<T>;
+
 export interface RollupError extends RollupLog {
 	name?: string;
 	stack?: string;
@@ -176,7 +180,7 @@ export interface PluginContext extends MinimalPluginContext {
 	addWatchFile: (id: string) => void;
 	cache: PluginCache;
 	emitFile: EmitFile;
-	error: (err: RollupError | string, pos?: number | { column: number; line: number }) => never;
+	error: (error: RollupError | string, pos?: number | { column: number; line: number }) => never;
 	getFileName: (fileReferenceId: string) => string;
 	getModuleIds: () => IterableIterator<string>;
 	getModuleInfo: GetModuleInfo;
@@ -287,7 +291,7 @@ export type ResolveDynamicImportHook = (
 
 export type ResolveImportMetaHook = (
 	this: PluginContext,
-	prop: string | null,
+	property: string | null,
 	options: { chunkId: string; format: InternalModuleFormat; moduleId: string }
 ) => string | null | void;
 
@@ -335,7 +339,7 @@ export interface OutputBundle {
 
 export interface FunctionPluginHooks {
 	augmentChunkHash: (this: PluginContext, chunk: RenderedChunk) => string | void;
-	buildEnd: (this: PluginContext, err?: Error) => void;
+	buildEnd: (this: PluginContext, error?: Error) => void;
 	buildStart: (this: PluginContext, options: NormalizedInputOptions) => void;
 	closeBundle: (this: PluginContext) => void;
 	closeWatcher: (this: PluginContext) => void;
@@ -359,7 +363,7 @@ export interface FunctionPluginHooks {
 			targetModuleId: string | null;
 		}
 	) => { left: string; right: string } | null | void;
-	renderError: (this: PluginContext, err?: Error) => void;
+	renderError: (this: PluginContext, error?: Error) => void;
 	renderStart: (
 		this: PluginContext,
 		outputOptions: NormalizedOutputOptions,
@@ -426,8 +430,11 @@ export type ParallelPluginHooks = Exclude<
 
 export type AddonHooks = 'banner' | 'footer' | 'intro' | 'outro';
 
-type MakeAsync<Fn> = Fn extends (this: infer This, ...args: infer Args) => infer Return
-	? (this: This, ...args: Args) => Return | Promise<Return>
+type MakeAsync<Function_> = Function_ extends (
+	this: infer This,
+	...parameters: infer Arguments
+) => infer Return
+	? (this: This, ...parameters: Arguments) => Return | Promise<Return>
 	: never;
 
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -492,7 +499,7 @@ export type SourcemapPathTransformOption = (
 	sourcemapPath: string
 ) => string;
 
-export type InputPluginOption = Plugin | null | false | undefined | InputPluginOption[];
+export type InputPluginOption = MaybePromise<Plugin | FalsyValue | InputPluginOption[]>;
 
 export interface InputOptions {
 	acorn?: Record<string, unknown>;
@@ -616,7 +623,7 @@ export type NormalizedAmdOptions = (
 
 type AddonFunction = (chunk: RenderedChunk) => string | Promise<string>;
 
-type OutputPluginOption = OutputPlugin | null | false | undefined | OutputPluginOption[];
+type OutputPluginOption = MaybePromise<OutputPlugin | FalsyValue | OutputPluginOption[]>;
 
 export interface OutputOptions {
 	amd?: AmdOptions;
@@ -854,13 +861,13 @@ export interface RollupWatchOptions extends InputOptions {
 }
 
 export type AwaitedEventListener<
-	T extends { [event: string]: (...args: any) => any },
+	T extends { [event: string]: (...parameters: any) => any },
 	K extends keyof T
-> = (...args: Parameters<T[K]>) => void | Promise<void>;
+> = (...parameters: Parameters<T[K]>) => void | Promise<void>;
 
-export interface AwaitingEventEmitter<T extends { [event: string]: (...args: any) => any }> {
+export interface AwaitingEventEmitter<T extends { [event: string]: (...parameters: any) => any }> {
 	close(): Promise<void>;
-	emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>): Promise<unknown>;
+	emit<K extends keyof T>(event: K, ...parameters: Parameters<T[K]>): Promise<unknown>;
 	/**
 	 * Removes an event listener.
 	 */
@@ -880,7 +887,7 @@ export interface AwaitingEventEmitter<T extends { [event: string]: (...args: any
 	 */
 	onCurrentRun<K extends keyof T>(
 		event: K,
-		listener: (...args: Parameters<T[K]>) => Promise<ReturnType<T[K]>>
+		listener: (...parameters: Parameters<T[K]>) => Promise<ReturnType<T[K]>>
 	): this;
 	removeAllListeners(): this;
 	removeListenersForCurrentRun(): this;

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.1.0
-	Wed, 12 Oct 2022 08:54:50 GMT - commit f7b768992209a970c240799cdff12a4fa437c0d4
+	Rollup.js v3.2.1
+	Sun, 16 Oct 2022 04:44:52 GMT - commit 46e1eaaaf05e0c2efa0ed395d7a3cfa99ef25fb5
 
 	https://github.com/rollup/rollup
 
@@ -19,6 +19,7 @@ require('node:perf_hooks');
 require('node:crypto');
 require('node:fs');
 require('node:events');
+require('tty');
 
 
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.1.0
-	Wed, 12 Oct 2022 08:54:50 GMT - commit f7b768992209a970c240799cdff12a4fa437c0d4
+	Rollup.js v3.2.1
+	Sun, 16 Oct 2022 04:44:52 GMT - commit 46e1eaaaf05e0c2efa0ed395d7a3cfa99ef25fb5
 
 	https://github.com/rollup/rollup
 
@@ -2705,7 +2705,7 @@ const setFsWatchFileListener = (path, fullPath, options, handlers) => {
 /**
  * @mixin
  */
-class NodeFsHandler$1 {
+let NodeFsHandler$1 = class NodeFsHandler {
 
 /**
  * @param {import("../index").FSWatcher} fsW
@@ -3061,7 +3061,7 @@ async _addToNodeFs(path, initialAdd, priorWh, depth, target) {
   }
 }
 
-}
+};
 
 var nodefsHandler = NodeFsHandler$1;
 
@@ -3281,7 +3281,7 @@ const sameTypes = (info, stats) => (
 /**
  * @mixin
  */
-class FsEventsHandler$1 {
+let FsEventsHandler$1 = class FsEventsHandler {
 
 /**
  * @param {import('../index').FSWatcher} fsw
@@ -3587,7 +3587,7 @@ async _addToFsEvents(path, transform, forceAdd, priorDepth) {
   }
 }
 
-}
+};
 
 fseventsHandler.exports = FsEventsHandler$1;
 fseventsHandler.exports.canUse = canUse;