rollup 3.0.0-3 → 3.0.0-4

package/README.md

@@ -76,7 +76,7 @@ For example, with CommonJS, the _entire tool or library must be imported_.
 
 ```js
 // import the entire utils object with CommonJS
-var utils = require('utils');
+var utils = require('node:utils');
 var query = 'Rollup';
 // use the ajax method of the utils object
 utils.ajax('https://api.example.com?search=' + query).then(handleResponse);
@@ -86,7 +86,7 @@ But with ES modules, instead of importing the whole `utils` object, we can just
 
 ```js
 // import the ajax function with an ES import statement
-import { ajax } from 'utils';
+import { ajax } from 'node:utils';
 var query = 'Rollup';
 // call the ajax function
 ajax('https://api.example.com?search=' + query).then(handleResponse);

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.0.0-2
-	Sat, 30 Jul 2022 12:51:34 GMT - commit 41906cedefbc03640d6e8ca23ce6975f3bb5c6a1
+	Rollup.js v3.0.0-3
+	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
 
 	https://github.com/rollup/rollup
 
@@ -13,17 +13,19 @@
 
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
 
-const process$1 = require('process');
+const process$1 = require('node:process');
 const rollup = require('../shared/rollup.js');
 const require$$2 = require('util');
 const require$$0 = require('path');
 const require$$0$1 = require('fs');
 const mergeOptions = require('../shared/mergeOptions.js');
 const loadConfigFile_js = require('../shared/loadConfigFile.js');
-require('perf_hooks');
-require('crypto');
-require('events');
-require('url');
+const node_fs = require('node:fs');
+const node_path = require('node:path');
+require('node:perf_hooks');
+require('node:crypto');
+require('node:events');
+require('node:url');
 require('tty');
 
 const help = "rollup version __VERSION__\n=====================================\n\nUsage: rollup [options] <entry file>\n\nBasic options:\n\n-c, --config <filename>     Use this config file (if argument is used but value\n                              is unspecified, defaults to rollup.config.js)\n-d, --dir <dirname>         Directory for chunks (if absent, prints to stdout)\n-e, --external <ids>        Comma-separate list of module IDs to exclude\n-f, --format <format>       Type of output (amd, cjs, es, iife, umd, system)\n-g, --globals <pairs>       Comma-separate list of `moduleID:Global` pairs\n-h, --help                  Show this help message\n-i, --input <filename>      Input (alternative to <entry file>)\n-m, --sourcemap             Generate sourcemap (`-m inline` for inline map)\n-n, --name <name>           Name for UMD export\n-o, --file <output>         Single output file (if absent, prints to stdout)\n-p, --plugin <plugin>       Use the plugin specified (may be repeated)\n-v, --version               Show version number\n-w, --watch                 Watch files in bundle and rebuild on changes\n--amd.id <id>               ID for AMD module (default is anonymous)\n--amd.autoId                Generate the AMD ID based off the chunk name\n--amd.basePath <prefix>     Path to prepend to auto generated AMD ID\n--amd.define <name>         Function to use in place of `define`\n--assetFileNames <pattern>  Name pattern for emitted assets\n--banner <text>             Code to insert at top of bundle (outside wrapper)\n--chunkFileNames <pattern>  Name pattern for emitted secondary chunks\n--compact                   Minify wrapper code\n--context <variable>        Specify top-level `this` value\n--entryFileNames <pattern>  Name pattern for emitted entry chunks\n--environment <values>      Settings passed to config file (see example)\n--no-esModule               Do not add __esModule property\n--exports <mode>            Specify export mode (auto, default, named, none)\n--extend                    Extend global variable defined by --name\n--no-externalLiveBindings   Do not generate code to support live bindings\n--failAfterWarnings         Exit with an error if the build produced warnings\n--footer <text>             Code to insert at end of bundle (outside wrapper)\n--no-freeze                 Do not freeze namespace objects\n--generatedCode <preset>    Which code features to use (es5/es2015)\n--no-hoistTransitiveImports Do not hoist transitive imports into entry chunks\n--no-indent                 Don't indent result\n--no-interop                Do not include interop block\n--inlineDynamicImports      Create single bundle when using dynamic imports\n--intro <text>              Code to insert at top of bundle (inside wrapper)\n--no-makeAbsoluteExternalsRelative Prevent normalization of external imports\n--maxParallelFileReads <value> How many files to read in parallel\n--minifyInternalExports     Force or disable minification of internal exports\n--noConflict                Generate a noConflict method for UMD globals\n--outro <text>              Code to insert at end of bundle (inside wrapper)\n--perf                      Display performance timings\n--no-preserveEntrySignatures Avoid facade chunks for entry points\n--preserveModules           Preserve module structure\n--preserveModulesRoot       Put preserved modules under this path at root level\n--preserveSymlinks          Do not follow symlinks when resolving files\n--no-sanitizeFileName       Do not replace invalid characters in file names\n--shimMissingExports        Create shim variables for missing exports\n--silent                    Don't print warnings\n--sourcemapBaseUrl <url>    Emit absolute sourcemap URLs with given base\n--sourcemapExcludeSources   Do not include source code in source maps\n--sourcemapFile <file>      Specify bundle position for source maps\n--stdin=ext                 Specify file extension used for stdin input\n--no-stdin                  Do not read \"-\" from stdin\n--no-strict                 Don't emit `\"use strict\";` in the generated modules\n--strictDeprecations        Throw errors for deprecated features\n--systemNullSetters         Replace empty SystemJS setters with `null`\n--no-treeshake              Disable tree-shaking optimisations\n--no-treeshake.annotations  Ignore pure call annotations\n--no-treeshake.moduleSideEffects Assume modules have no side-effects\n--no-treeshake.propertyReadSideEffects Ignore property access side-effects\n--no-treeshake.tryCatchDeoptimization Do not turn off try-catch-tree-shaking\n--no-treeshake.unknownGlobalSideEffects Assume unknown globals do not throw\n--waitForBundleInput        Wait for bundle input files\n--watch.buildDelay <number> Throttle watch rebuilds\n--no-watch.clearScreen      Do not clear the screen when rebuilding\n--watch.skipWrite           Do not write files to disk when watching\n--watch.exclude <files>     Exclude files from being watched\n--watch.include <files>     Limit watching to specified files\n--watch.onStart <cmd>       Shell command to run on `\"START\"` event\n--watch.onBundleStart <cmd> Shell command to run on `\"BUNDLE_START\"` event\n--watch.onBundleEnd <cmd>   Shell command to run on `\"BUNDLE_END\"` event\n--watch.onEnd <cmd>         Shell command to run on `\"END\"` event\n--watch.onError <cmd>       Shell command to run on `\"ERROR\"` event\n--validate                  Validate output\n\nExamples:\n\n# use settings in config file\nrollup -c\n\n# in config file, process.env.INCLUDE_DEPS === 'true'\n# and process.env.BUILD === 'production'\nrollup -c --environment INCLUDE_DEPS,BUILD:production\n\n# create CommonJS bundle.js from src/main.js\nrollup --format=cjs --file=bundle.js -- src/main.js\n\n# create self-executing IIFE using `window.jQuery`\n# and `window._` as external globals\nrollup -f iife --globals jquery:jQuery,lodash:_ \\\n  -i src/app.js -o build/app.js -m build/app.js.map\n\nNotes:\n\n* When piping to stdout, only inline sourcemaps are permitted\n\nFor more information visit https://rollupjs.org\n";
@@ -1539,19 +1541,9 @@ async function build(inputOptions, warnings, silent = false) {
         }
         const { output: outputs } = await bundle.generate(output);
         for (const file of outputs) {
-            let source;
-            if (file.type === 'asset') {
-                source = file.source;
-            }
-            else {
-                source = file.code;
-                if (output.sourcemap === 'inline') {
-                    source += `\n//# ${rollup.SOURCEMAPPING_URL}=${file.map.toUrl()}\n`;
-                }
-            }
             if (outputs.length > 1)
                 process$1.stdout.write(`\n${loadConfigFile_js.cyan(loadConfigFile_js.bold(`//→ ${file.fileName}:`))}\n`);
-            process$1.stdout.write(source);
+            process$1.stdout.write(file.type === 'asset' ? file.source : file.code);
         }
         if (!silent) {
             warnings.flush();
@@ -1572,7 +1564,7 @@ async function build(inputOptions, warnings, silent = false) {
 const DEFAULT_CONFIG_BASE = 'rollup.config';
 async function getConfigPath(commandConfig) {
     if (commandConfig === true) {
-        return require$$0.resolve(await findConfigFileNameInCwd());
+        return node_path.resolve(await findConfigFileNameInCwd());
     }
     if (commandConfig.slice(0, 5) === 'node:') {
         const pkgName = commandConfig.slice(5);
@@ -1591,10 +1583,10 @@ async function getConfigPath(commandConfig) {
             }
         }
     }
-    return require$$0.resolve(commandConfig);
+    return node_path.resolve(commandConfig);
 }
 async function findConfigFileNameInCwd() {
-    const filesInWorkingDir = new Set(await require$$0$1.promises.readdir(process$1.cwd()));
+    const filesInWorkingDir = new Set(await node_fs.promises.readdir(process$1.cwd()));
     for (const extension of ['mjs', 'cjs', 'ts']) {
         const fileName = `${DEFAULT_CONFIG_BASE}.${extension}`;
         if (filesInWorkingDir.has(fileName))

package/dist/es/rollup.js

@@ -1,16 +1,17 @@
 /*
   @license
-	Rollup.js v3.0.0-2
-	Sat, 30 Jul 2022 12:51:34 GMT - commit 41906cedefbc03640d6e8ca23ce6975f3bb5c6a1
+	Rollup.js v3.0.0-3
+	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
 
 	https://github.com/rollup/rollup
 
 	Released under the MIT License.
 */
 export { version as VERSION, defineConfig, rollup, watch } from './shared/rollup.js';
+import 'node:path';
 import 'path';
-import 'process';
-import 'perf_hooks';
-import 'crypto';
-import 'fs';
-import 'events';
+import 'node:process';
+import 'node:perf_hooks';
+import 'node:crypto';
+import 'node:fs';
+import 'node:events';

package/dist/es/shared/rollup.js

@@ -1,20 +1,21 @@
 /*
   @license
-	Rollup.js v3.0.0-2
-	Sat, 30 Jul 2022 12:51:34 GMT - commit 41906cedefbc03640d6e8ca23ce6975f3bb5c6a1
+	Rollup.js v3.0.0-3
+	Mon, 15 Aug 2022 04:43:13 GMT - commit 84a4a595851ef71494b6f2ab558968bfbc148bdb
 
 	https://github.com/rollup/rollup
 
 	Released under the MIT License.
 */
-import require$$0, { resolve, basename, extname, dirname, relative as relative$1, win32, posix, isAbsolute as isAbsolute$1 } from 'path';
-import process$1 from 'process';
-import { performance } from 'perf_hooks';
-import { createHash as createHash$1 } from 'crypto';
-import { promises } from 'fs';
-import { EventEmitter } from 'events';
+import { resolve, basename, extname, dirname, relative as relative$1 } from 'node:path';
+import require$$0, { win32, posix, isAbsolute as isAbsolute$1, resolve as resolve$1 } from 'path';
+import process$1 from 'node:process';
+import { performance } from 'node:perf_hooks';
+import { createHash as createHash$1 } from 'node:crypto';
+import { promises } from 'node:fs';
+import { EventEmitter } from 'node:events';
 
-var version$1 = "3.0.0-2";
+var version$1 = "3.0.0-3";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -2120,11 +2121,19 @@ function errInvalidOption(option, urlHash, explanation, value) {
         url: `https://rollupjs.org/guide/en/#${urlHash}`
     };
 }
-function errInvalidPluginHook(hook, plugin) {
+function errInvalidAddonPluginHook(hook, plugin) {
     return {
         code: INVALID_PLUGIN_HOOK,
         hook,
-        message: `Error running plugin hook "${hook}" for "${plugin}", expected a function hook.`,
+        message: `Error running plugin hook "${hook}" for plugin "${plugin}", expected a string, a function hook or an object with a "handler" string or function.`,
+        plugin
+    };
+}
+function errInvalidFunctionPluginHook(hook, plugin) {
+    return {
+        code: INVALID_PLUGIN_HOOK,
+        hook,
+        message: `Error running plugin hook "${hook}" for plugin "${plugin}", expected a function hook or an object with a "handler" function.`,
         plugin
     };
 }
@@ -4721,7 +4730,7 @@ function getMatcherString(id, resolutionBase) {
         return normalizePath(id);
     }
     // resolve('') is valid and will default to process.cwd()
-    const basePath = normalizePath(resolve(resolutionBase || ''))
+    const basePath = normalizePath(resolve$1(resolutionBase || ''))
         // escape all possible (posix + win) path characters that might interfere with regex
         .replace(/[-^$*+?.()|[\]{}]/g, '\\$&');
     // Note that we use posix.join because:
@@ -13438,32 +13447,32 @@ function removeExtensionFromRelativeAmdId(id) {
 }
 
 const builtins = {
-    assert: true,
-    buffer: true,
-    console: true,
-    constants: true,
-    domain: true,
-    events: true,
-    http: true,
-    https: true,
-    os: true,
-    path: true,
-    process: true,
-    punycode: true,
-    querystring: true,
-    stream: true,
-    string_decoder: true,
-    timers: true,
-    tty: true,
-    url: true,
-    util: true,
-    vm: true,
-    zlib: true
+    assert: 1,
+    buffer: 1,
+    console: 1,
+    constants: 1,
+    domain: 1,
+    events: 1,
+    http: 1,
+    https: 1,
+    os: 1,
+    path: 1,
+    process: 1,
+    punycode: 1,
+    querystring: 1,
+    stream: 1,
+    string_decoder: 1,
+    timers: 1,
+    tty: 1,
+    url: 1,
+    util: 1,
+    vm: 1,
+    zlib: 1
 };
 function warnOnBuiltins(warn, dependencies) {
     const externalBuiltins = dependencies
         .map(({ importPath }) => importPath)
-        .filter(importPath => importPath in builtins);
+        .filter(importPath => importPath in builtins || importPath.startsWith('node:'));
     if (!externalBuiltins.length)
         return;
     warn(errMissingNodeBuiltins(externalBuiltins));
@@ -15188,7 +15197,7 @@ class Chunk {
             ? sanitizedId.slice(0, -extName.length)
             : sanitizedId;
         if (isAbsolute(idWithoutExtension)) {
-            return preserveModulesRoot && idWithoutExtension.startsWith(preserveModulesRoot)
+            return preserveModulesRoot && resolve(idWithoutExtension).startsWith(preserveModulesRoot)
                 ? idWithoutExtension.slice(preserveModulesRoot.length).replace(/^[\\/]/, '')
                 : relative(this.inputBase, idWithoutExtension);
         }
@@ -15981,7 +15990,7 @@ async function renderChunks(chunks, outputBundle, pluginDriver, outputOptions, o
     const chunkGraph = getChunkGraph(chunks);
     const { nonHashedChunksWithPlaceholders, renderedChunksByPlaceholder, hashDependenciesByPlaceholder } = await transformChunksAndGenerateContentHashes(renderedChunks, chunkGraph, outputOptions, pluginDriver, onwarn);
     const hashesByPlaceholder = generateFinalHashes(renderedChunksByPlaceholder, hashDependenciesByPlaceholder, outputBundle);
-    addChunksToBundle(renderedChunksByPlaceholder, hashesByPlaceholder, outputBundle, nonHashedChunksWithPlaceholders);
+    addChunksToBundle(renderedChunksByPlaceholder, hashesByPlaceholder, outputBundle, nonHashedChunksWithPlaceholders, pluginDriver, outputOptions);
     timeEnd('transform chunks', 2);
 }
 function reserveEntryChunksInBundle(chunks) {
@@ -16125,22 +16134,40 @@ function generateFinalHashes(renderedChunksByPlaceholder, hashDependenciesByPlac
     }
     return hashesByPlaceholder;
 }
-function addChunksToBundle(renderedChunksByPlaceholder, hashesByPlaceholder, outputBundle, nonHashedChunksWithPlaceholders) {
+function addChunksToBundle(renderedChunksByPlaceholder, hashesByPlaceholder, outputBundle, nonHashedChunksWithPlaceholders, pluginDriver, options) {
     for (const { chunk, code, fileName, map } of renderedChunksByPlaceholder.values()) {
-        const updatedCode = replacePlaceholders(code, hashesByPlaceholder);
+        let updatedCode = replacePlaceholders(code, hashesByPlaceholder);
         const finalFileName = replacePlaceholders(fileName, hashesByPlaceholder);
         if (map) {
             map.file = replacePlaceholders(map.file, hashesByPlaceholder);
+            updatedCode += emitSourceMapAndGetComment(finalFileName, map, pluginDriver, options);
         }
         outputBundle[finalFileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder);
     }
     for (const { chunk, code, fileName, map } of nonHashedChunksWithPlaceholders) {
-        const updatedCode = hashesByPlaceholder.size
+        let updatedCode = hashesByPlaceholder.size
             ? replacePlaceholders(code, hashesByPlaceholder)
             : code;
+        if (map) {
+            updatedCode += emitSourceMapAndGetComment(fileName, map, pluginDriver, options);
+        }
         outputBundle[fileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder);
     }
 }
+function emitSourceMapAndGetComment(fileName, map, pluginDriver, { sourcemap, sourcemapBaseUrl }) {
+    let url;
+    if (sourcemap === 'inline') {
+        url = map.toUrl();
+    }
+    else {
+        const sourcemapFileName = `${basename(fileName)}.map`;
+        url = sourcemapBaseUrl
+            ? new URL(sourcemapFileName, sourcemapBaseUrl).toString()
+            : sourcemapFileName;
+        pluginDriver.emitFile({ fileName: `${fileName}.map`, source: map.toString(), type: 'asset' });
+    }
+    return sourcemap === 'hidden' ? '' : `//# ${SOURCEMAPPING_URL}=${url}\n`;
+}
 
 class Bundle {
     constructor(outputOptions, unsetOptions, inputOptions, pluginDriver, graph) {
@@ -22582,7 +22609,7 @@ function getPluginContext(plugin, pluginCache, graph, options, fileEmitter, exis
     else {
         cacheInstance = getCacheForUncacheablePlugin(plugin.name);
     }
-    const context = {
+    return {
         addWatchFile(id) {
             if (graph.phase >= BuildPhase.GENERATE) {
                 return this.error(errInvalidRollupPhaseForAddWatchFile());
@@ -22632,9 +22659,9 @@ function getPluginContext(plugin, pluginCache, graph, options, fileEmitter, exis
             options.onwarn(warning);
         }
     };
-    return context;
 }
 
+// This will make sure no input hook is omitted
 const inputHookNames = {
     buildEnd: 1,
     buildStart: 1,
@@ -22654,8 +22681,9 @@ class PluginDriver {
     constructor(graph, options, userPlugins, pluginCache, basePluginDriver) {
         this.graph = graph;
         this.options = options;
-        this.unfulfilledActions = new Set();
         this.pluginCache = pluginCache;
+        this.sortedPlugins = new Map();
+        this.unfulfilledActions = new Set();
         this.fileEmitter = new FileEmitter(graph, options, basePluginDriver && basePluginDriver.fileEmitter);
         this.emitFile = this.fileEmitter.emitFile.bind(this.fileEmitter);
         this.getFileName = this.fileEmitter.getFileName.bind(this.fileEmitter);
@@ -22686,21 +22714,21 @@ class PluginDriver {
     }
     // chains, first non-null result stops and returns
     hookFirst(hookName, args, replaceContext, skipped) {
-        let promise = Promise.resolve(undefined);
-        for (const plugin of this.plugins) {
+        let promise = Promise.resolve(null);
+        for (const plugin of this.getSortedPlugins(hookName)) {
             if (skipped && skipped.has(plugin))
                 continue;
             promise = promise.then(result => {
                 if (result != null)
                     return result;
-                return this.runHook(hookName, args, plugin, false, replaceContext);
+                return this.runHook(hookName, args, plugin, replaceContext);
             });
         }
         return promise;
     }
     // chains synchronously, first non-null result stops and returns
     hookFirstSync(hookName, args, replaceContext) {
-        for (const plugin of this.plugins) {
+        for (const plugin of this.getSortedPlugins(hookName)) {
             const result = this.runHookSync(hookName, args, plugin, replaceContext);
             if (result != null)
                 return result;
@@ -22708,56 +22736,58 @@ class PluginDriver {
         return null;
     }
     // parallel, ignores returns
-    hookParallel(hookName, args, replaceContext) {
-        const promises = [];
-        for (const plugin of this.plugins) {
-            const hookPromise = this.runHook(hookName, args, plugin, false, replaceContext);
-            if (!hookPromise)
-                continue;
-            promises.push(hookPromise);
+    async hookParallel(hookName, args, replaceContext) {
+        const parallelPromises = [];
+        for (const plugin of this.getSortedPlugins(hookName)) {
+            if (plugin[hookName].sequential) {
+                await Promise.all(parallelPromises);
+                parallelPromises.length = 0;
+                await this.runHook(hookName, args, plugin, replaceContext);
+            }
+            else {
+                parallelPromises.push(this.runHook(hookName, args, plugin, replaceContext));
+            }
         }
-        return Promise.all(promises).then(() => { });
+        await Promise.all(parallelPromises);
     }
     // chains, reduces returned value, handling the reduced value as the first hook argument
     hookReduceArg0(hookName, [arg0, ...rest], reduce, replaceContext) {
         let promise = Promise.resolve(arg0);
-        for (const plugin of this.plugins) {
-            promise = promise.then(arg0 => {
-                const args = [arg0, ...rest];
-                const hookPromise = this.runHook(hookName, args, plugin, false, replaceContext);
-                if (!hookPromise)
-                    return arg0;
-                return hookPromise.then(result => reduce.call(this.pluginContexts.get(plugin), arg0, result, plugin));
-            });
+        for (const plugin of this.getSortedPlugins(hookName)) {
+            promise = promise.then(arg0 => this.runHook(hookName, [arg0, ...rest], plugin, replaceContext).then(result => reduce.call(this.pluginContexts.get(plugin), arg0, result, plugin)));
         }
         return promise;
     }
     // chains synchronously, reduces returned value, handling the reduced value as the first hook argument
     hookReduceArg0Sync(hookName, [arg0, ...rest], reduce, replaceContext) {
-        for (const plugin of this.plugins) {
+        for (const plugin of this.getSortedPlugins(hookName)) {
             const args = [arg0, ...rest];
             const result = this.runHookSync(hookName, args, plugin, replaceContext);
             arg0 = reduce.call(this.pluginContexts.get(plugin), arg0, result, plugin);
         }
         return arg0;
     }
-    // chains, reduces returned value to type T, handling the reduced value separately. permits hooks as values.
-    hookReduceValue(hookName, initialValue, args, reduce, replaceContext) {
-        let promise = Promise.resolve(initialValue);
-        for (const plugin of this.plugins) {
-            promise = promise.then(value => {
-                const hookPromise = this.runHook(hookName, args, plugin, true, replaceContext);
-                if (!hookPromise)
-                    return value;
-                return hookPromise.then(result => reduce.call(this.pluginContexts.get(plugin), value, result, plugin));
-            });
+    // chains, reduces returned value to type string, handling the reduced value separately. permits hooks as values.
+    async hookReduceValue(hookName, initialValue, args, reducer) {
+        const results = [];
+        const parallelResults = [];
+        for (const plugin of this.getSortedPlugins(hookName, validateAddonPluginHandler)) {
+            if (plugin[hookName].sequential) {
+                results.push(...(await Promise.all(parallelResults)));
+                parallelResults.length = 0;
+                results.push(await this.runHook(hookName, args, plugin));
+            }
+            else {
+                parallelResults.push(this.runHook(hookName, args, plugin));
+            }
         }
-        return promise;
+        results.push(...(await Promise.all(parallelResults)));
+        return results.reduce(reducer, await initialValue);
     }
     // chains synchronously, reduces returned value to type T, handling the reduced value separately. permits hooks as values.
     hookReduceValueSync(hookName, initialValue, args, reduce, replaceContext) {
         let acc = initialValue;
-        for (const plugin of this.plugins) {
+        for (const plugin of this.getSortedPlugins(hookName)) {
             const result = this.runHookSync(hookName, args, plugin, replaceContext);
             acc = reduce.call(this.pluginContexts.get(plugin), acc, result, plugin);
         }
@@ -22766,31 +22796,32 @@ class PluginDriver {
     // chains, ignores returns
     hookSeq(hookName, args, replaceContext) {
         let promise = Promise.resolve();
-        for (const plugin of this.plugins) {
-            promise = promise.then(() => this.runHook(hookName, args, plugin, false, replaceContext));
+        for (const plugin of this.getSortedPlugins(hookName)) {
+            promise = promise.then(() => this.runHook(hookName, args, plugin, replaceContext));
         }
-        return promise;
+        return promise.then(noReturn);
+    }
+    getSortedPlugins(hookName, validateHandler) {
+        return getOrCreate(this.sortedPlugins, hookName, () => getSortedValidatedPlugins(hookName, this.plugins, validateHandler));
     }
-    runHook(hookName, args, plugin, permitValues, hookContext) {
+    // Implementation signature
+    runHook(hookName, args, plugin, replaceContext) {
+        // We always filter for plugins that support the hook before running it
         const hook = plugin[hookName];
-        if (!hook)
-            return undefined;
+        const handler = typeof hook === 'object' ? hook.handler : hook;
         let context = this.pluginContexts.get(plugin);
-        if (hookContext) {
-            context = hookContext(context, plugin);
+        if (replaceContext) {
+            context = replaceContext(context, plugin);
         }
         let action = null;
         return Promise.resolve()
             .then(() => {
-            // permit values allows values to be returned instead of a functional hook
-            if (typeof hook !== 'function') {
-                if (permitValues)
-                    return hook;
-                return error(errInvalidPluginHook(hookName, plugin.name));
+            if (typeof handler !== 'function') {
+                return handler;
             }
             // eslint-disable-next-line @typescript-eslint/ban-types
-            const hookResult = hook.apply(context, args);
-            if (!hookResult || !hookResult.then) {
+            const hookResult = handler.apply(context, args);
+            if (!(hookResult === null || hookResult === void 0 ? void 0 : hookResult.then)) {
                 // short circuit for non-thenables and non-Promises
                 return hookResult;
             }
@@ -22823,29 +22854,61 @@ class PluginDriver {
      * @param hookName Name of the plugin hook. Must be in `PluginHooks`.
      * @param args Arguments passed to the plugin hook.
      * @param plugin The acutal plugin
-     * @param hookContext When passed, the plugin context can be overridden.
+     * @param replaceContext When passed, the plugin context can be overridden.
      */
-    runHookSync(hookName, args, plugin, hookContext) {
+    runHookSync(hookName, args, plugin, replaceContext) {
         const hook = plugin[hookName];
-        if (!hook)
-            return undefined;
+        const handler = typeof hook === 'object' ? hook.handler : hook;
         let context = this.pluginContexts.get(plugin);
-        if (hookContext) {
-            context = hookContext(context, plugin);
+        if (replaceContext) {
+            context = replaceContext(context, plugin);
         }
         try {
-            // permit values allows values to be returned instead of a functional hook
-            if (typeof hook !== 'function') {
-                return error(errInvalidPluginHook(hookName, plugin.name));
-            }
             // eslint-disable-next-line @typescript-eslint/ban-types
-            return hook.apply(context, args);
+            return handler.apply(context, args);
         }
         catch (err) {
             return error(errPluginError(err, plugin.name, { hook: hookName }));
         }
     }
 }
+function getSortedValidatedPlugins(hookName, plugins, validateHandler = validateFunctionPluginHandler) {
+    const pre = [];
+    const normal = [];
+    const post = [];
+    for (const plugin of plugins) {
+        const hook = plugin[hookName];
+        if (hook) {
+            if (typeof hook === 'object') {
+                validateHandler(hook.handler, hookName, plugin);
+                if (hook.order === 'pre') {
+                    pre.push(plugin);
+                    continue;
+                }
+                if (hook.order === 'post') {
+                    post.push(plugin);
+                    continue;
+                }
+            }
+            else {
+                validateHandler(hook, hookName, plugin);
+            }
+            normal.push(plugin);
+        }
+    }
+    return [...pre, ...normal, ...post];
+}
+function validateFunctionPluginHandler(handler, hookName, plugin) {
+    if (typeof handler !== 'function') {
+        error(errInvalidFunctionPluginHook(hookName, plugin.name));
+    }
+}
+function validateAddonPluginHandler(handler, hookName, plugin) {
+    if (typeof handler !== 'string' && typeof handler !== 'function') {
+        return error(errInvalidAddonPluginHook(hookName, plugin.name));
+    }
+}
+function noReturn() { }
 
 class Queue {
     constructor(maxParallel) {
@@ -23754,17 +23817,15 @@ async function getInputOptions(rawInputOptions, watchMode) {
     if (!rawInputOptions) {
         throw new Error('You must supply an options object to rollup');
     }
-    const rawPlugins = ensureArray(rawInputOptions.plugins);
+    const rawPlugins = getSortedValidatedPlugins('options', ensureArray(rawInputOptions.plugins));
     const { options, unsetOptions } = normalizeInputOptions(await rawPlugins.reduce(applyOptionHook(watchMode), Promise.resolve(rawInputOptions)));
     normalizePlugins(options.plugins, ANONYMOUS_PLUGIN_PREFIX);
     return { options, unsetOptions };
 }
 function applyOptionHook(watchMode) {
     return async (inputOptions, plugin) => {
-        if (plugin.options) {
-            return ((await plugin.options.call({ meta: { rollupVersion: version$1, watchMode } }, await inputOptions)) || inputOptions);
-        }
-        return inputOptions;
+        const handler = 'handler' in plugin.options ? plugin.options.handler : plugin.options;
+        return ((await handler.call({ meta: { rollupVersion: version$1, watchMode } }, await inputOptions)) || inputOptions);
     };
 }
 function normalizePlugins(plugins, anonymousPrefix) {
@@ -23843,32 +23904,7 @@ async function writeOutputFile(outputFile, outputOptions) {
     const fileName = resolve(outputOptions.dir || dirname(outputOptions.file), outputFile.fileName);
     // 'recursive: true' does not throw if the folder structure, or parts of it, already exist
     await promises.mkdir(dirname(fileName), { recursive: true });
-    let writeSourceMapPromise;
-    let source;
-    if (outputFile.type === 'asset') {
-        source = outputFile.source;
-    }
-    else {
-        source = outputFile.code;
-        if (outputOptions.sourcemap && outputFile.map) {
-            let url;
-            if (outputOptions.sourcemap === 'inline') {
-                url = outputFile.map.toUrl();
-            }
-            else {
-                const { sourcemapBaseUrl } = outputOptions;
-                const sourcemapFileName = `${basename(outputFile.fileName)}.map`;
-                url = sourcemapBaseUrl
-                    ? new URL(sourcemapFileName, sourcemapBaseUrl).toString()
-                    : sourcemapFileName;
-                writeSourceMapPromise = promises.writeFile(`${fileName}.map`, outputFile.map.toString());
-            }
-            if (outputOptions.sourcemap !== 'hidden') {
-                source += `//# ${SOURCEMAPPING_URL}=${url}\n`;
-            }
-        }
-    }
-    return Promise.all([promises.writeFile(fileName, source), writeSourceMapPromise]);
+    return promises.writeFile(fileName, outputFile.type === 'asset' ? outputFile.source : outputFile.code);
 }
 /**
  * Auxiliary function for defining rollup configuration