rollup 3.0.0-4 → 3.0.0-5

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-3
-	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
+	Rollup.js v3.0.0-4
+	Wed, 31 Aug 2022 05:26:36 GMT - commit 392609619bcb75a0c7216f38e40d9573419a8e3f
 
 	https://github.com/rollup/rollup
 
@@ -48,7 +48,7 @@ function mergeOptions(config, rawCommandOptions = { external: [], globals: undef
     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), 'config', 'environment', 'plugin', 'silent', 'failAfterWarnings', 'stdin', 'waitForBundleInput', 'configPlugin'), 'CLI flags', warn, /^_$|output$|config/);
+    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;
 }
@@ -4803,6 +4803,7 @@ class Watcher {
     constructor(configs, emitter) {
         this.buildDelay = 0;
         this.buildTimeout = null;
+        this.closed = false;
         this.invalidatedIds = new Map();
         this.rerun = false;
         this.running = true;
@@ -4815,12 +4816,15 @@ class Watcher {
         process$1.nextTick(() => this.run());
     }
     async close() {
+        if (this.closed)
+            return;
+        this.closed = true;
         if (this.buildTimeout)
             clearTimeout(this.buildTimeout);
         for (const task of this.tasks) {
             task.close();
         }
-        await this.emitter.emitAndAwait('close');
+        await this.emitter.emit('close');
         this.emitter.removeAllListeners();
     }
     invalidate(file) {
@@ -4847,20 +4851,20 @@ class Watcher {
         this.buildTimeout = setTimeout(async () => {
             this.buildTimeout = null;
             try {
-                await Promise.all([...this.invalidatedIds].map(([id, event]) => this.emitter.emitAndAwait('change', id, { event })));
+                await Promise.all([...this.invalidatedIds].map(([id, event]) => this.emitter.emit('change', id, { event })));
                 this.invalidatedIds.clear();
-                this.emitter.emit('restart');
-                this.emitter.removeAwaited();
+                await this.emitter.emit('restart');
+                this.emitter.removeListenersForCurrentRun();
                 this.run();
             }
             catch (error) {
                 this.invalidatedIds.clear();
-                this.emitter.emit('event', {
+                await this.emitter.emit('event', {
                     code: 'ERROR',
                     error,
                     result: null
                 });
-                this.emitter.emit('event', {
+                await this.emitter.emit('event', {
                     code: 'END'
                 });
             }
@@ -4868,14 +4872,14 @@ class Watcher {
     }
     async run() {
         this.running = true;
-        this.emitter.emit('event', {
+        await this.emitter.emit('event', {
             code: 'START'
         });
         for (const task of this.tasks) {
             await task.run();
         }
         this.running = false;
-        this.emitter.emit('event', {
+        await this.emitter.emit('event', {
             code: 'END'
         });
         if (this.rerun) {
@@ -4933,7 +4937,7 @@ class Task {
             cache: this.cache
         };
         const start = Date.now();
-        this.watcher.emitter.emit('event', {
+        await this.watcher.emitter.emit('event', {
             code: 'BUNDLE_START',
             input: this.options.input,
             output: this.outputFiles
@@ -4946,7 +4950,7 @@ class Task {
             }
             this.updateWatchedFiles(result);
             this.skipWrite || (await Promise.all(this.outputs.map(output => result.write(output))));
-            this.watcher.emitter.emit('event', {
+            await this.watcher.emitter.emit('event', {
                 code: 'BUNDLE_END',
                 duration: Date.now() - start,
                 input: this.options.input,
@@ -4965,7 +4969,7 @@ class Task {
                     this.cache.modules = this.cache.modules.filter(module => module.id !== error.id);
                 }
             }
-            this.watcher.emitter.emit('event', {
+            await this.watcher.emitter.emit('event', {
                 code: 'ERROR',
                 error,
                 result

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-3
-	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
+	Rollup.js v3.0.0-4
+	Wed, 31 Aug 2022 05:26:36 GMT - commit 392609619bcb75a0c7216f38e40d9573419a8e3f
 
 	https://github.com/rollup/rollup
 
@@ -9,21 +9,19 @@
 */
 'use strict';
 
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+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('path');
-require('fs');
-require('util');
-require('node:process');
 require('tty');
+require('path');
 require('node:perf_hooks');
 require('node:crypto');
-require('node:fs');
 require('node:events');
 
 

package/dist/rollup.d.ts

@@ -28,6 +28,7 @@ export interface RollupLog {
 	pluginCode?: string;
 	pos?: number;
 	reexporter?: string;
+	stack?: string;
 	url?: string;
 }
 
@@ -571,7 +572,7 @@ interface GeneratedCodeOptions extends Partial<NormalizedGeneratedCodeOptions> {
 
 export type OptionsPaths = Record<string, string> | ((id: string) => string);
 
-export type InteropType = boolean | 'auto' | 'esModule' | 'default' | 'defaultOnly';
+export type InteropType = 'compat' | 'auto' | 'esModule' | 'default' | 'defaultOnly';
 
 export type GetInterop = (id: string | null) => InteropType;
 
@@ -591,6 +592,7 @@ export type AmdOptions = (
 	  }
 ) & {
 	define?: string;
+	forceJsExtensionForImports?: boolean;
 };
 
 export type NormalizedAmdOptions = (
@@ -604,6 +606,7 @@ export type NormalizedAmdOptions = (
 	  }
 ) & {
 	define: string;
+	forceJsExtensionForImports: boolean;
 };
 
 type AddonFunction = (chunk: RenderedChunk) => string | Promise<string>;
@@ -619,7 +622,7 @@ export interface OutputOptions {
 	/** @deprecated Use the "renderDynamicImport" plugin hook instead. */
 	dynamicImportFunction?: string;
 	entryFileNames?: string | ((chunkInfo: PreRenderedChunk) => string);
-	esModule?: boolean;
+	esModule?: boolean | 'if-default-prop';
 	exports?: 'default' | 'named' | 'none' | 'auto';
 	extend?: boolean;
 	externalLiveBindings?: boolean;
@@ -669,7 +672,7 @@ export interface NormalizedOutputOptions {
 	/** @deprecated Use the "renderDynamicImport" plugin hook instead. */
 	dynamicImportFunction: string | undefined;
 	entryFileNames: string | ((chunkInfo: PreRenderedChunk) => string);
-	esModule: boolean;
+	esModule: boolean | 'if-default-prop';
 	exports: 'default' | 'named' | 'none' | 'auto';
 	extend: boolean;
 	externalLiveBindings: boolean;
@@ -839,40 +842,37 @@ export interface RollupWatchOptions extends InputOptions {
 	watch?: WatcherOptions | false;
 }
 
-interface TypedEventEmitter<T extends { [event: string]: (...args: any) => any }> {
-	addListener<K extends keyof T>(event: K, listener: T[K]): this;
-	emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>): boolean;
-	eventNames(): Array<keyof T>;
-	getMaxListeners(): number;
-	listenerCount(type: keyof T): number;
-	listeners<K extends keyof T>(event: K): Array<T[K]>;
-	off<K extends keyof T>(event: K, listener: T[K]): this;
-	on<K extends keyof T>(event: K, listener: T[K]): this;
-	once<K extends keyof T>(event: K, listener: T[K]): this;
-	prependListener<K extends keyof T>(event: K, listener: T[K]): this;
-	prependOnceListener<K extends keyof T>(event: K, listener: T[K]): this;
-	rawListeners<K extends keyof T>(event: K): Array<T[K]>;
-	removeAllListeners<K extends keyof T>(event?: K): this;
-	removeListener<K extends keyof T>(event: K, listener: T[K]): this;
-	setMaxListeners(n: number): this;
-}
-
-export interface RollupAwaitingEmitter<T extends { [event: string]: (...args: any) => any }>
-	extends TypedEventEmitter<T> {
+export type AwaitedEventListener<
+	T extends { [event: string]: (...args: any) => any },
+	K extends keyof T
+> = (...args: Parameters<T[K]>) => void | Promise<void>;
+
+export interface AwaitingEventEmitter<T extends { [event: string]: (...args: any) => any }> {
 	close(): Promise<void>;
-	emitAndAwait<K extends keyof T>(event: K, ...args: Parameters<T[K]>): Promise<ReturnType<T[K]>[]>;
+	emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>): Promise<unknown>;
+	/**
+	 * Removes an event listener.
+	 */
+	off<K extends keyof T>(event: K, listener: AwaitedEventListener<T, K>): this;
+	/**
+	 * Registers an event listener that will be awaited before Rollup continues.
+	 * All listeners will be awaited in parallel while rejections are tracked via
+	 * Promise.all.
+	 */
+	on<K extends keyof T>(event: K, listener: AwaitedEventListener<T, K>): this;
 	/**
-	 * 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.
+	 * Registers an event listener that will be awaited before Rollup continues.
+	 * All listeners will be awaited in parallel while rejections are tracked via
+	 * Promise.all.
+	 * Listeners are removed automatically when removeListenersForCurrentRun is
+	 * called, which happens automatically after each run.
 	 */
-	onCurrentAwaited<K extends keyof T>(
+	onCurrentRun<K extends keyof T>(
 		event: K,
 		listener: (...args: Parameters<T[K]>) => Promise<ReturnType<T[K]>>
 	): this;
-	removeAwaited(): this;
+	removeAllListeners(): this;
+	removeListenersForCurrentRun(): this;
 }
 
 export type RollupWatcherEvent =
@@ -888,7 +888,7 @@ export type RollupWatcherEvent =
 	| { code: 'END' }
 	| { code: 'ERROR'; error: RollupError; result: RollupBuild | null };
 
-export type RollupWatcher = RollupAwaitingEmitter<{
+export type RollupWatcher = AwaitingEventEmitter<{
 	change: (id: string, change: { event: ChangeEvent }) => void;
 	close: () => void;
 	event: (event: RollupWatcherEvent) => void;

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-3
-	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
+	Rollup.js v3.0.0-4
+	Wed, 31 Aug 2022 05:26:36 GMT - commit 392609619bcb75a0c7216f38e40d9573419a8e3f
 
 	https://github.com/rollup/rollup
 
@@ -9,7 +9,7 @@
 */
 'use strict';
 
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const rollup = require('./shared/rollup.js');
 require('node:path');

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-3
-	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
+	Rollup.js v3.0.0-4
+	Wed, 31 Aug 2022 05:26:36 GMT - commit 392609619bcb75a0c7216f38e40d9573419a8e3f
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-3
-	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
+	Rollup.js v3.0.0-4
+	Wed, 31 Aug 2022 05:26:36 GMT - commit 392609619bcb75a0c7216f38e40d9573419a8e3f
 
 	https://github.com/rollup/rollup
 
@@ -9,12 +9,10 @@
 */
 'use strict';
 
+const node_fs = require('node:fs');
 const node_path = require('node:path');
-const node_url = require('node:url');
-const require$$0 = require('path');
-const require$$0$1 = require('fs');
-const require$$2 = require('util');
 const process$1 = require('node:process');
+const node_url = require('node:url');
 const tty = require('tty');
 const rollup = require('./rollup.js');
 const mergeOptions = require('./mergeOptions.js');
@@ -174,122 +172,6 @@ function handleError(err, recover = false) {
         process$1.exit(1);
 }
 
-var getPackageType$2 = {exports: {}};
-
-const path$2 = require$$0;
-
-function isNodeModules$2(directory) {
-	let basename = path$2.basename(directory);
-	/* istanbul ignore next: platform specific branch */
-	if (path$2.sep === '\\') {
-		basename = basename.toLowerCase();
-	}
-
-	return basename === 'node_modules';
-}
-
-var isNodeModules_1 = isNodeModules$2;
-
-var cache = new Map();
-
-const path$1 = require$$0;
-const {promisify} = require$$2;
-const readFile = promisify(require$$0$1.readFile);
-
-const isNodeModules$1 = isNodeModules_1;
-const resultsCache$1 = cache;
-
-const promiseCache = new Map();
-
-async function getDirectoryTypeActual$1(directory) {
-	if (isNodeModules$1(directory)) {
-		return 'commonjs';
-	}
-
-	try {
-		return JSON.parse(await readFile(path$1.resolve(directory, 'package.json'))).type || 'commonjs';
-	} catch (_) {
-	}
-
-	const parent = path$1.dirname(directory);
-	if (parent === directory) {
-		return 'commonjs';
-	}
-
-	return getDirectoryType$1(parent);
-}
-
-async function getDirectoryType$1(directory) {
-	if (resultsCache$1.has(directory)) {
-		return resultsCache$1.get(directory);
-	}
-
-	if (promiseCache.has(directory)) {
-		return promiseCache.get(directory);
-	}
-
-	const promise = getDirectoryTypeActual$1(directory);
-	promiseCache.set(directory, promise);
-	const result = await promise;
-	resultsCache$1.set(directory, result);
-	promiseCache.delete(directory);
-
-	return result;
-}
-
-function getPackageType$1(filename) {
-	return getDirectoryType$1(path$1.resolve(path$1.dirname(filename)));
-}
-
-var async = getPackageType$1;
-
-const path = require$$0;
-const {readFileSync} = require$$0$1;
-
-const isNodeModules = isNodeModules_1;
-const resultsCache = cache;
-
-function getDirectoryTypeActual(directory) {
-	if (isNodeModules(directory)) {
-		return 'commonjs';
-	}
-
-	try {
-		return JSON.parse(readFileSync(path.resolve(directory, 'package.json'))).type || 'commonjs';
-	} catch (_) {
-	}
-
-	const parent = path.dirname(directory);
-	if (parent === directory) {
-		return 'commonjs';
-	}
-
-	return getDirectoryType(parent);
-}
-
-function getDirectoryType(directory) {
-	if (resultsCache.has(directory)) {
-		return resultsCache.get(directory);
-	}
-
-	const result = getDirectoryTypeActual(directory);
-	resultsCache.set(directory, result);
-
-	return result;
-}
-
-function getPackageTypeSync$1(filename) {
-	return getDirectoryType(path.resolve(path.dirname(filename)));
-}
-
-var sync = getPackageTypeSync$1;
-
-const getPackageType = async;
-const getPackageTypeSync = sync;
-
-getPackageType$2.exports = filename => getPackageType(filename);
-getPackageType$2.exports.sync = getPackageTypeSync;
-
 function batchWarnings() {
     let count = 0;
     const deferredWarnings = new Map();
@@ -665,7 +547,7 @@ async function requireOrImport(pluginPath) {
 }
 
 async function loadConfigFile(fileName, commandOptions = {}) {
-    const configs = await loadConfigsFromFile(fileName, commandOptions);
+    const configs = await getConfigList(getDefaultFromCjs(await getConfigFileExport(fileName, commandOptions)), commandOptions);
     const warnings = batchWarnings();
     try {
         const normalizedConfigs = [];
@@ -681,19 +563,50 @@ async function loadConfigFile(fileName, commandOptions = {}) {
         throw err;
     }
 }
-async function loadConfigsFromFile(fileName, commandOptions) {
-    const extension = node_path.extname(fileName);
-    const configFileExport = commandOptions.configPlugin ||
-        // We always transpile the .js non-module case because many legacy code bases rely on this
-        (extension === '.js' && getPackageType$2.exports.sync(fileName) !== 'module')
-        ? await getDefaultFromTranspiledConfigFile(fileName, commandOptions)
-        : getDefaultFromCjs((await import(node_url.pathToFileURL(fileName).href)).default);
-    return getConfigList(configFileExport, commandOptions);
+async function getConfigFileExport(fileName, commandOptions) {
+    if (commandOptions.configPlugin || commandOptions.bundleConfigAsCjs) {
+        try {
+            return await loadTranspiledConfigFile(fileName, commandOptions);
+        }
+        catch (err) {
+            if (err.message.includes('not defined in ES module scope')) {
+                return rollup.error(rollup.errCannotBundleConfigAsEsm(err));
+            }
+            throw err;
+        }
+    }
+    let cannotLoadEsm = false;
+    const handleWarning = (warning) => {
+        if (warning.message.includes('To load an ES module')) {
+            cannotLoadEsm = true;
+        }
+    };
+    process$1.on('warning', handleWarning);
+    try {
+        const fileUrl = node_url.pathToFileURL(fileName);
+        if (process$1.env.ROLLUP_WATCH) {
+            // We are adding the current date to allow reloads in watch mode
+            fileUrl.search = `?${Date.now()}`;
+        }
+        return (await import(fileUrl.href)).default;
+    }
+    catch (err) {
+        if (cannotLoadEsm) {
+            return rollup.error(rollup.errCannotLoadConfigAsCjs(err));
+        }
+        if (err.message.includes('not defined in ES module scope')) {
+            return rollup.error(rollup.errCannotLoadConfigAsEsm(err));
+        }
+        throw err;
+    }
+    finally {
+        process$1.off('warning', handleWarning);
+    }
 }
 function getDefaultFromCjs(namespace) {
-    return namespace.__esModule ? namespace.default : namespace;
+    return namespace.default || namespace;
 }
-async function getDefaultFromTranspiledConfigFile(fileName, commandOptions) {
+async function loadTranspiledConfigFile(fileName, { bundleConfigAsCjs, configPlugin, silent }) {
     const warnings = batchWarnings();
     const inputOptions = {
         external: (id) => (id[0] !== '.' && !node_path.isAbsolute(id)) || id.slice(-5, id.length) === '.json',
@@ -702,15 +615,15 @@ async function getDefaultFromTranspiledConfigFile(fileName, commandOptions) {
         plugins: [],
         treeshake: false
     };
-    await addPluginsFromCommandOption(commandOptions.configPlugin, inputOptions);
+    await addPluginsFromCommandOption(configPlugin, inputOptions);
     const bundle = await rollup.rollup(inputOptions);
-    if (!commandOptions.silent && warnings.count > 0) {
+    if (!silent && warnings.count > 0) {
         stderr(bold(`loaded ${rollup.relativeId(fileName)} with warnings`));
         warnings.flush();
     }
     const { output: [{ code }] } = await bundle.generate({
         exports: 'named',
-        format: 'cjs',
+        format: bundleConfigAsCjs ? 'cjs' : 'es',
         plugins: [
             {
                 name: 'transpile-import-meta',
@@ -725,33 +638,16 @@ async function getDefaultFromTranspiledConfigFile(fileName, commandOptions) {
             }
         ]
     });
-    return loadConfigFromBundledFile(fileName, code);
+    return loadConfigFromWrittenFile(node_path.join(node_path.dirname(fileName), `rollup.config-${Date.now()}.${bundleConfigAsCjs ? 'cjs' : 'mjs'}`), code);
 }
-function loadConfigFromBundledFile(fileName, bundledCode) {
-    const resolvedFileName = require.resolve(fileName);
-    const extension = node_path.extname(resolvedFileName);
-    const defaultLoader = require.extensions[extension];
-    require.extensions[extension] = (module, requiredFileName) => {
-        if (requiredFileName === resolvedFileName) {
-            module._compile(bundledCode, requiredFileName);
-        }
-        else {
-            if (defaultLoader) {
-                defaultLoader(module, requiredFileName);
-            }
-        }
-    };
-    delete require.cache[resolvedFileName];
+async function loadConfigFromWrittenFile(bundledFileName, bundledCode) {
+    await node_fs.promises.writeFile(bundledFileName, bundledCode);
     try {
-        const config = getDefaultFromCjs(require(fileName));
-        require.extensions[extension] = defaultLoader;
-        return config;
+        return (await import(node_url.pathToFileURL(bundledFileName).href)).default;
     }
-    catch (err) {
-        if (err.code === 'ERR_REQUIRE_ESM') {
-            return rollup.error(rollup.errTranspiledEsmConfig(fileName));
-        }
-        throw err;
+    finally {
+        // Not awaiting here saves some ms while potentially hiding a non-critical error
+        node_fs.promises.unlink(bundledFileName);
     }
 }
 async function getConfigList(configFileExport, commandOptions) {

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-3
-	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
+	Rollup.js v3.0.0-4
+	Wed, 31 Aug 2022 05:26:36 GMT - commit 392609619bcb75a0c7216f38e40d9573419a8e3f
 
 	https://github.com/rollup/rollup
 
@@ -37,7 +37,7 @@ function mergeOptions(config, rawCommandOptions = { external: [], globals: undef
     if (outputOptionsArray.length === 0)
         outputOptionsArray.push({});
     const outputOptions = outputOptionsArray.map(singleOutputOptions => mergeOutputOptions(singleOutputOptions, command, warn));
-    rollup.warnUnknownOptions(command, Object.keys(inputOptions).concat(Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'), Object.keys(commandAliases), 'config', 'environment', 'plugin', 'silent', 'failAfterWarnings', 'stdin', 'waitForBundleInput', 'configPlugin'), 'CLI flags', warn, /^_$|output$|config/);
+    rollup.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;
 }