rollup 2.77.3 → 2.79.0

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.3
-	Thu, 11 Aug 2022 05:48:58 GMT - commit 1165d46685ef3c70617b2f150ab245ff5de5e783
+	Rollup.js v2.79.0
+	Wed, 31 Aug 2022 04:52:13 GMT - commit 8477f8ff1fe80086556021542b22942ad27a0a69
 
 	https://github.com/rollup/rollup
 
@@ -27,7 +27,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-var version$1 = "2.77.3";
+var version$1 = "2.79.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -373,6 +373,22 @@ function errInvalidOption(option, urlHash, explanation, value) {
         url: `https://rollupjs.org/guide/en/#${urlHash}`
     };
 }
+function errInvalidAddonPluginHook(hook, plugin) {
+    return {
+        code: Errors.INVALID_PLUGIN_HOOK,
+        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: Errors.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
+    };
+}
 function errInvalidRollupPhaseForAddWatchFile() {
     return {
         code: Errors.INVALID_ROLLUP_PHASE,
@@ -2410,15 +2426,16 @@ const RESERVED_NAMES$1 = RESERVED_NAMES;
 
 const illegalCharacters = /[^$_a-zA-Z0-9]/g;
 const startsWithDigit = (str) => /\d/.test(str[0]);
+const needsEscape = (str) => startsWithDigit(str) || RESERVED_NAMES$1.has(str) || str === 'arguments';
 function isLegal(str) {
-    if (startsWithDigit(str) || RESERVED_NAMES$1.has(str)) {
+    if (needsEscape(str)) {
         return false;
     }
     return !illegalCharacters.test(str);
 }
 function makeLegal(str) {
     str = str.replace(/-(\w)/g, (_, letter) => letter.toUpperCase()).replace(illegalCharacters, '_');
-    if (startsWithDigit(str) || RESERVED_NAMES$1.has(str))
+    if (needsEscape(str))
         str = `_${str}`;
     return str || '_';
 }
@@ -13429,11 +13446,18 @@ function getInteropBlock(dependencies, interop, externalLiveBindings, freeze, na
     return `${getHelpersBlock(neededInteropHelpers, accessedGlobals, indent, snippets, externalLiveBindings, freeze, namespaceToStringTag)}${interopStatements.length > 0 ? `${interopStatements.join(n)}${n}${n}` : ''}`;
 }
 
+function addJsExtension(name) {
+    return name.endsWith('.js') ? name : name + '.js';
+}
+
 // AMD resolution will only respect the AMD baseUrl if the .js extension is omitted.
 // The assumption is that this makes sense for all relative ids:
 // https://requirejs.org/docs/api.html#jsfiles
-function removeExtensionFromRelativeAmdId(id) {
-    return id[0] === '.' ? removeJsExtension(id) : id;
+function updateExtensionForRelativeAmdId(id, forceJsExtensionForImports) {
+    if (id[0] !== '.') {
+        return id;
+    }
+    return forceJsExtensionForImports ? addJsExtension(id) : removeJsExtension(id);
 }
 
 const builtins = {
@@ -13472,7 +13496,7 @@ function warnOnBuiltins(warn, dependencies) {
 
 function amd(magicString, { accessedGlobals, dependencies, exports, hasExports, id, indent: t, intro, isEntryFacade, isModuleFacade, namedExportsMode, outro, snippets, warn }, { amd, esModule, externalLiveBindings, freeze, interop, namespaceToStringTag, strict }) {
     warnOnBuiltins(warn, dependencies);
-    const deps = dependencies.map(m => `'${removeExtensionFromRelativeAmdId(m.id)}'`);
+    const deps = dependencies.map(m => `'${updateExtensionForRelativeAmdId(m.id, amd.forceJsExtensionForImports)}'`);
     const args = dependencies.map(m => m.name);
     const { n, getNonArrowFunctionIntro, _ } = snippets;
     if (namedExportsMode && hasExports) {
@@ -13916,7 +13940,7 @@ function umd(magicString, { accessedGlobals, dependencies, exports, hasExports,
         });
     }
     warnOnBuiltins(warn, dependencies);
-    const amdDeps = dependencies.map(m => `'${removeExtensionFromRelativeAmdId(m.id)}'`);
+    const amdDeps = dependencies.map(m => `'${updateExtensionForRelativeAmdId(m.id, amd.forceJsExtensionForImports)}'`);
     const cjsDeps = dependencies.map(m => `require('${m.id}')`);
     const trimmedImports = trimEmptyImports(dependencies);
     const globalDeps = trimmedImports.map(module => globalProp(module.globalName, globalVar, getPropertyAccess));
@@ -15123,7 +15147,7 @@ class Chunk {
         }
     }
     finaliseDynamicImports(options, snippets) {
-        const stripKnownJsExtensions = options.format === 'amd';
+        const stripKnownJsExtensions = options.format === 'amd' && !options.amd.forceJsExtensionForImports;
         for (const [module, code] of this.renderedModuleSources) {
             for (const { node, resolution } of module.dynamicImports) {
                 const chunk = this.chunkByModule.get(resolution);
@@ -22602,7 +22626,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());
@@ -22660,9 +22684,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,
@@ -22678,19 +22702,14 @@ const inputHookNames = {
     watchChange: 1
 };
 const inputHooks = Object.keys(inputHookNames);
-function throwInvalidHookError(hookName, pluginName) {
-    return error({
-        code: 'INVALID_PLUGIN_HOOK',
-        message: `Error running plugin hook ${hookName} for ${pluginName}, expected a function hook.`
-    });
-}
 class PluginDriver {
     constructor(graph, options, userPlugins, pluginCache, basePluginDriver) {
         this.graph = graph;
         this.options = options;
+        this.pluginCache = pluginCache;
+        this.sortedPlugins = new Map();
         this.unfulfilledActions = new Set();
         warnDeprecatedHooks(userPlugins, options);
-        this.pluginCache = pluginCache;
         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);
@@ -22720,21 +22739,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;
@@ -22742,56 +22761,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);
         }
@@ -22800,31 +22821,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);
     }
-    runHook(hookName, args, plugin, permitValues, hookContext) {
+    getSortedPlugins(hookName, validateHandler) {
+        return getOrCreate(this.sortedPlugins, hookName, () => getSortedValidatedPlugins(hookName, this.plugins, validateHandler));
+    }
+    // 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 throwInvalidHookError(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;
             }
@@ -22857,29 +22879,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 throwInvalidHookError(hookName, plugin.name);
-            }
             // eslint-disable-next-line @typescript-eslint/ban-types
-            return hook.apply(context, args);
+            return handler.apply(context, args);
         }
         catch (err) {
             return throwPluginError(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) {
@@ -23514,6 +23568,7 @@ const getAmd = (config) => {
         autoId: false,
         basePath: '',
         define: 'define',
+        forceJsExtensionForImports: false,
         ...config.amd
     };
     if ((mergedOption.autoId || mergedOption.basePath) && mergedOption.id) {
@@ -23527,13 +23582,15 @@ const getAmd = (config) => {
         normalized = {
             autoId: true,
             basePath: mergedOption.basePath,
-            define: mergedOption.define
+            define: mergedOption.define,
+            forceJsExtensionForImports: mergedOption.forceJsExtensionForImports
         };
     }
     else {
         normalized = {
             autoId: false,
             define: mergedOption.define,
+            forceJsExtensionForImports: mergedOption.forceJsExtensionForImports,
             id: mergedOption.id
         };
     }
@@ -23720,17 +23777,15 @@ async function getInputOptions(rawInputOptions, watchMode) {
     if (!rawInputOptions) {
         throw new Error('You must supply an options object to rollup');
     }
-    const rawPlugins = ensureArray$1(rawInputOptions.plugins);
+    const rawPlugins = getSortedValidatedPlugins('options', ensureArray$1(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) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.3
-	Thu, 11 Aug 2022 05:48:58 GMT - commit 1165d46685ef3c70617b2f150ab245ff5de5e783
+	Rollup.js v2.79.0
+	Wed, 31 Aug 2022 04:52:13 GMT - commit 8477f8ff1fe80086556021542b22942ad27a0a69
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.3
-	Thu, 11 Aug 2022 05:48:58 GMT - commit 1165d46685ef3c70617b2f150ab245ff5de5e783
+	Rollup.js v2.79.0
+	Wed, 31 Aug 2022 04:52:13 GMT - commit 8477f8ff1fe80086556021542b22942ad27a0a69
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.77.3",
+  "version": "2.79.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",