rollup 2.41.5 → 2.42.3

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.41.5
-	Thu, 18 Mar 2021 05:07:55 GMT - commit e2ae914dfe84fd9601743e7ce15841bb483146c4
+	Rollup.js v2.42.3
+	Mon, 22 Mar 2021 14:48:44 GMT - commit f67e6c9b2cb4066f2ddcdb6d45308f840b2ac62f
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.41.5
-	Thu, 18 Mar 2021 05:07:55 GMT - commit e2ae914dfe84fd9601743e7ce15841bb483146c4
+	Rollup.js v2.42.3
+	Mon, 22 Mar 2021 14:48:44 GMT - commit f67e6c9b2cb4066f2ddcdb6d45308f840b2ac62f
 
 
 	https://github.com/rollup/rollup
@@ -14,7 +14,7 @@ import * as fs from 'fs';
 import { lstatSync, realpathSync, readdirSync } from 'fs';
 import { EventEmitter } from 'events';
 
-var version$1 = "2.41.5";
+var version$1 = "2.42.3";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -1465,6 +1465,7 @@ function relative(from, to) {
 const ArrowFunctionExpression$1 = 'ArrowFunctionExpression';
 const BlockStatement$1 = 'BlockStatement';
 const CallExpression$1 = 'CallExpression';
+const ChainExpression$1 = 'ChainExpression';
 const ExpressionStatement$1 = 'ExpressionStatement';
 const Identifier$1 = 'Identifier';
 const ImportDefaultSpecifier$1 = 'ImportDefaultSpecifier';
@@ -9430,11 +9431,11 @@ function getPluginWithTimers(plugin, index) {
             timerLabel += ` - ${hook}`;
             timedPlugin[hook] = function () {
                 timeStart(timerLabel, 4);
-                const result = plugin[hook].apply(this === timedPlugin ? plugin : this, arguments);
+                let result = plugin[hook].apply(this === timedPlugin ? plugin : this, arguments);
                 timeEnd(timerLabel, 4);
                 if (result && typeof result.then === 'function') {
                     timeStart(`${timerLabel} (async)`, 4);
-                    result.then(() => timeEnd(`${timerLabel} (async)`, 4));
+                    result = result.then(() => timeEnd(`${timerLabel} (async)`, 4));
                 }
                 return result;
             };
@@ -17830,8 +17831,28 @@ function writeFile(dest, data) {
     });
 }
 
-async function resolveId(source, importer, preserveSymlinks, pluginDriver, skip, customOptions) {
-    const pluginResult = await pluginDriver.hookFirst('resolveId', [source, importer, { custom: customOptions }], null, skip);
+function resolveIdViaPlugins(source, importer, pluginDriver, moduleLoaderResolveId, skip, customOptions) {
+    let skipped = null;
+    let replaceContext = null;
+    if (skip) {
+        skipped = new Set();
+        for (const skippedCall of skip) {
+            if (source === skippedCall.source && importer === skippedCall.importer) {
+                skipped.add(skippedCall.plugin);
+            }
+        }
+        replaceContext = (pluginContext, plugin) => ({
+            ...pluginContext,
+            resolve: (source, importer, { custom, skipSelf } = BLANK) => {
+                return moduleLoaderResolveId(source, importer, custom, skipSelf ? [...skip, { importer, plugin, source }] : skip);
+            }
+        });
+    }
+    return pluginDriver.hookFirst('resolveId', [source, importer, { custom: customOptions }], replaceContext, skipped);
+}
+
+async function resolveId(source, importer, preserveSymlinks, pluginDriver, moduleLoaderResolveId, skip, customOptions) {
+    const pluginResult = await resolveIdViaPlugins(source, importer, pluginDriver, moduleLoaderResolveId, skip, customOptions);
     if (pluginResult != null)
         return pluginResult;
     // external modules (non-entry modules that start with neither '.' or '/')
@@ -18129,6 +18150,11 @@ class ModuleLoader {
         this.indexedEntryModules = [];
         this.latestLoadModulesPromise = Promise.resolve();
         this.nextEntryModuleIndex = 0;
+        this.resolveId = async (source, importer, customOptions, skip = null) => {
+            return this.addDefaultsToResolvedId(this.getNormalizedResolvedIdWithoutDefaults(this.options.external(source, importer, false)
+                ? false
+                : await resolveId(source, importer, this.options.preserveSymlinks, this.pluginDriver, this.resolveId, skip, customOptions), importer, source));
+        };
         this.hasModuleSideEffects = options.treeshake
             ? options.treeshake.moduleSideEffects
             : () => true;
@@ -18182,11 +18208,6 @@ class ModuleLoader {
         }
         return module;
     }
-    async resolveId(source, importer, customOptions, skip = null) {
-        return this.addDefaultsToResolvedId(this.getNormalizedResolvedIdWithoutDefaults(this.options.external(source, importer, false)
-            ? false
-            : await resolveId(source, importer, this.options.preserveSymlinks, this.pluginDriver, skip, customOptions), importer, source));
-    }
     addDefaultsToResolvedId(resolvedId) {
         var _a, _b;
         if (!resolvedId) {
@@ -18384,7 +18405,7 @@ class ModuleLoader {
         return resolvedId;
     }
     async loadEntryModule(unresolvedId, isEntry, importer, implicitlyLoadedBefore) {
-        const resolveIdResult = await resolveId(unresolvedId, importer, this.options.preserveSymlinks, this.pluginDriver, null, EMPTY_OBJECT);
+        const resolveIdResult = await resolveId(unresolvedId, importer, this.options.preserveSymlinks, this.pluginDriver, this.resolveId, null, EMPTY_OBJECT);
         if (resolveIdResult == null) {
             return error(implicitlyLoadedBefore === null
                 ? errUnresolvedEntry(unresolvedId)
@@ -18458,87 +18479,84 @@ function getDeprecatedContextHandler(handler, handlerName, newHandlerName, plugi
         return handler(...args);
     });
 }
-function getPluginContexts(pluginCache, graph, options, fileEmitter) {
-    const existingPluginNames = new Set();
-    return (plugin, pidx) => {
-        let cacheable = true;
-        if (typeof plugin.cacheKey !== 'string') {
-            if (plugin.name.startsWith(ANONYMOUS_PLUGIN_PREFIX) ||
-                plugin.name.startsWith(ANONYMOUS_OUTPUT_PLUGIN_PREFIX) ||
-                existingPluginNames.has(plugin.name)) {
-                cacheable = false;
-            }
-            else {
-                existingPluginNames.add(plugin.name);
-            }
-        }
-        let cacheInstance;
-        if (!pluginCache) {
-            cacheInstance = NO_CACHE;
-        }
-        else if (cacheable) {
-            const cacheKey = plugin.cacheKey || plugin.name;
-            cacheInstance = createPluginCache(pluginCache[cacheKey] || (pluginCache[cacheKey] = Object.create(null)));
+function getPluginContext(plugin, pluginCache, graph, options, fileEmitter, existingPluginNames) {
+    let cacheable = true;
+    if (typeof plugin.cacheKey !== 'string') {
+        if (plugin.name.startsWith(ANONYMOUS_PLUGIN_PREFIX) ||
+            plugin.name.startsWith(ANONYMOUS_OUTPUT_PLUGIN_PREFIX) ||
+            existingPluginNames.has(plugin.name)) {
+            cacheable = false;
         }
         else {
-            cacheInstance = getCacheForUncacheablePlugin(plugin.name);
+            existingPluginNames.add(plugin.name);
         }
-        const context = {
-            addWatchFile(id) {
-                if (graph.phase >= BuildPhase.GENERATE) {
-                    return this.error(errInvalidRollupPhaseForAddWatchFile());
-                }
-                graph.watchFiles[id] = true;
-            },
-            cache: cacheInstance,
-            emitAsset: getDeprecatedContextHandler((name, source) => fileEmitter.emitFile({ type: 'asset', name, source }), 'emitAsset', 'emitFile', plugin.name, true, options),
-            emitChunk: getDeprecatedContextHandler((id, options) => fileEmitter.emitFile({ type: 'chunk', id, name: options && options.name }), 'emitChunk', 'emitFile', plugin.name, true, options),
-            emitFile: fileEmitter.emitFile,
-            error(err) {
-                return throwPluginError(err, plugin.name);
-            },
-            getAssetFileName: getDeprecatedContextHandler(fileEmitter.getFileName, 'getAssetFileName', 'getFileName', plugin.name, true, options),
-            getChunkFileName: getDeprecatedContextHandler(fileEmitter.getFileName, 'getChunkFileName', 'getFileName', plugin.name, true, options),
-            getFileName: fileEmitter.getFileName,
-            getModuleIds: () => graph.modulesById.keys(),
-            getModuleInfo: graph.getModuleInfo,
-            getWatchFiles: () => Object.keys(graph.watchFiles),
-            isExternal: getDeprecatedContextHandler((id, parentId, isResolved = false) => options.external(id, parentId, isResolved), 'isExternal', 'resolve', plugin.name, true, options),
-            meta: {
-                rollupVersion: version$1,
-                watchMode: graph.watchMode
-            },
-            get moduleIds() {
-                function* wrappedModuleIds() {
-                    warnDeprecation({
-                        message: `Accessing "this.moduleIds" on the plugin context by plugin ${plugin.name} is deprecated. The "this.getModuleIds" plugin context function should be used instead.`,
-                        plugin: plugin.name
-                    }, false, options);
-                    yield* moduleIds;
-                }
-                const moduleIds = graph.modulesById.keys();
-                return wrappedModuleIds();
-            },
-            parse: graph.contextParse.bind(graph),
-            resolve(source, importer, { custom, skipSelf } = BLANK) {
-                return graph.moduleLoader.resolveId(source, importer, custom, skipSelf ? pidx : null);
-            },
-            resolveId: getDeprecatedContextHandler((source, importer) => graph.moduleLoader
-                .resolveId(source, importer, BLANK)
-                .then(resolveId => resolveId && resolveId.id), 'resolveId', 'resolve', plugin.name, true, options),
-            setAssetSource: fileEmitter.setAssetSource,
-            warn(warning) {
-                if (typeof warning === 'string')
-                    warning = { message: warning };
-                if (warning.code)
-                    warning.pluginCode = warning.code;
-                warning.code = 'PLUGIN_WARNING';
-                warning.plugin = plugin.name;
-                options.onwarn(warning);
+    }
+    let cacheInstance;
+    if (!pluginCache) {
+        cacheInstance = NO_CACHE;
+    }
+    else if (cacheable) {
+        const cacheKey = plugin.cacheKey || plugin.name;
+        cacheInstance = createPluginCache(pluginCache[cacheKey] || (pluginCache[cacheKey] = Object.create(null)));
+    }
+    else {
+        cacheInstance = getCacheForUncacheablePlugin(plugin.name);
+    }
+    const context = {
+        addWatchFile(id) {
+            if (graph.phase >= BuildPhase.GENERATE) {
+                return this.error(errInvalidRollupPhaseForAddWatchFile());
             }
-        };
-        return context;
+            graph.watchFiles[id] = true;
+        },
+        cache: cacheInstance,
+        emitAsset: getDeprecatedContextHandler((name, source) => fileEmitter.emitFile({ type: 'asset', name, source }), 'emitAsset', 'emitFile', plugin.name, true, options),
+        emitChunk: getDeprecatedContextHandler((id, options) => fileEmitter.emitFile({ type: 'chunk', id, name: options && options.name }), 'emitChunk', 'emitFile', plugin.name, true, options),
+        emitFile: fileEmitter.emitFile,
+        error(err) {
+            return throwPluginError(err, plugin.name);
+        },
+        getAssetFileName: getDeprecatedContextHandler(fileEmitter.getFileName, 'getAssetFileName', 'getFileName', plugin.name, true, options),
+        getChunkFileName: getDeprecatedContextHandler(fileEmitter.getFileName, 'getChunkFileName', 'getFileName', plugin.name, true, options),
+        getFileName: fileEmitter.getFileName,
+        getModuleIds: () => graph.modulesById.keys(),
+        getModuleInfo: graph.getModuleInfo,
+        getWatchFiles: () => Object.keys(graph.watchFiles),
+        isExternal: getDeprecatedContextHandler((id, parentId, isResolved = false) => options.external(id, parentId, isResolved), 'isExternal', 'resolve', plugin.name, true, options),
+        meta: {
+            rollupVersion: version$1,
+            watchMode: graph.watchMode
+        },
+        get moduleIds() {
+            function* wrappedModuleIds() {
+                warnDeprecation({
+                    message: `Accessing "this.moduleIds" on the plugin context by plugin ${plugin.name} is deprecated. The "this.getModuleIds" plugin context function should be used instead.`,
+                    plugin: plugin.name
+                }, false, options);
+                yield* moduleIds;
+            }
+            const moduleIds = graph.modulesById.keys();
+            return wrappedModuleIds();
+        },
+        parse: graph.contextParse.bind(graph),
+        resolve(source, importer, { custom, skipSelf } = BLANK) {
+            return graph.moduleLoader.resolveId(source, importer, custom, skipSelf ? [{ importer, plugin, source }] : null);
+        },
+        resolveId: getDeprecatedContextHandler((source, importer) => graph.moduleLoader
+            .resolveId(source, importer, BLANK)
+            .then(resolveId => resolveId && resolveId.id), 'resolveId', 'resolve', plugin.name, true, options),
+        setAssetSource: fileEmitter.setAssetSource,
+        warn(warning) {
+            if (typeof warning === 'string')
+                warning = { message: warning };
+            if (warning.code)
+                warning.pluginCode = warning.code;
+            warning.code = 'PLUGIN_WARNING';
+            warning.plugin = plugin.name;
+            options.onwarn(warning);
+        }
     };
+    return context;
 }
 
 const inputHookNames = {
@@ -18565,6 +18583,7 @@ class PluginDriver {
     constructor(graph, options, userPlugins, pluginCache, basePluginDriver) {
         this.graph = graph;
         this.options = options;
+        this.pluginContexts = new Map();
         warnDeprecatedHooks(userPlugins, options);
         this.pluginCache = pluginCache;
         this.fileEmitter = new FileEmitter(graph, options, basePluginDriver && basePluginDriver.fileEmitter);
@@ -18573,7 +18592,10 @@ class PluginDriver {
         this.finaliseAssets = this.fileEmitter.assertAssetsFinalized;
         this.setOutputBundle = this.fileEmitter.setOutputBundle;
         this.plugins = userPlugins.concat(basePluginDriver ? basePluginDriver.plugins : []);
-        this.pluginContexts = this.plugins.map(getPluginContexts(pluginCache, graph, options, this.fileEmitter));
+        const existingPluginNames = new Set();
+        for (const plugin of this.plugins) {
+            this.pluginContexts.set(plugin, getPluginContext(plugin, pluginCache, graph, options, this.fileEmitter, existingPluginNames));
+        }
         if (basePluginDriver) {
             for (const plugin of userPlugins) {
                 for (const hook of inputHooks) {
@@ -18588,23 +18610,23 @@ class PluginDriver {
         return new PluginDriver(this.graph, this.options, plugins, this.pluginCache, this);
     }
     // chains, first non-null result stops and returns
-    hookFirst(hookName, args, replaceContext, skip) {
+    hookFirst(hookName, args, replaceContext, skipped) {
         let promise = Promise.resolve(undefined);
-        for (let i = 0; i < this.plugins.length; i++) {
-            if (skip === i)
+        for (const plugin of this.plugins) {
+            if (skipped && skipped.has(plugin))
                 continue;
             promise = promise.then(result => {
                 if (result != null)
                     return result;
-                return this.runHook(hookName, args, i, false, replaceContext);
+                return this.runHook(hookName, args, plugin, false, replaceContext);
             });
         }
         return promise;
     }
     // chains synchronously, first non-null result stops and returns
     hookFirstSync(hookName, args, replaceContext) {
-        for (let i = 0; i < this.plugins.length; i++) {
-            const result = this.runHookSync(hookName, args, i, replaceContext);
+        for (const plugin of this.plugins) {
+            const result = this.runHookSync(hookName, args, plugin, replaceContext);
             if (result != null)
                 return result;
         }
@@ -18613,8 +18635,8 @@ class PluginDriver {
     // parallel, ignores returns
     hookParallel(hookName, args, replaceContext) {
         const promises = [];
-        for (let i = 0; i < this.plugins.length; i++) {
-            const hookPromise = this.runHook(hookName, args, i, false, replaceContext);
+        for (const plugin of this.plugins) {
+            const hookPromise = this.runHook(hookName, args, plugin, false, replaceContext);
             if (!hookPromise)
                 continue;
             promises.push(hookPromise);
@@ -18624,35 +18646,35 @@ class PluginDriver {
     // 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 (let i = 0; i < this.plugins.length; i++) {
+        for (const plugin of this.plugins) {
             promise = promise.then(arg0 => {
                 const args = [arg0, ...rest];
-                const hookPromise = this.runHook(hookName, args, i, false, replaceContext);
+                const hookPromise = this.runHook(hookName, args, plugin, false, replaceContext);
                 if (!hookPromise)
                     return arg0;
-                return hookPromise.then(result => reduce.call(this.pluginContexts[i], arg0, result, this.plugins[i]));
+                return hookPromise.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 (let i = 0; i < this.plugins.length; i++) {
+        for (const plugin of this.plugins) {
             const args = [arg0, ...rest];
-            const result = this.runHookSync(hookName, args, i, replaceContext);
-            arg0 = reduce.call(this.pluginContexts[i], arg0, result, this.plugins[i]);
+            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 (let i = 0; i < this.plugins.length; i++) {
+        for (const plugin of this.plugins) {
             promise = promise.then(value => {
-                const hookPromise = this.runHook(hookName, args, i, true, replaceContext);
+                const hookPromise = this.runHook(hookName, args, plugin, true, replaceContext);
                 if (!hookPromise)
                     return value;
-                return hookPromise.then(result => reduce.call(this.pluginContexts[i], value, result, this.plugins[i]));
+                return hookPromise.then(result => reduce.call(this.pluginContexts.get(plugin), value, result, plugin));
             });
         }
         return promise;
@@ -18660,32 +18682,31 @@ class PluginDriver {
     // 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 (let i = 0; i < this.plugins.length; i++) {
-            const result = this.runHookSync(hookName, args, i, replaceContext);
-            acc = reduce.call(this.pluginContexts[i], acc, result, this.plugins[i]);
+        for (const plugin of this.plugins) {
+            const result = this.runHookSync(hookName, args, plugin, replaceContext);
+            acc = reduce.call(this.pluginContexts.get(plugin), acc, result, plugin);
         }
         return acc;
     }
     // chains, ignores returns
     hookSeq(hookName, args, replaceContext) {
         let promise = Promise.resolve();
-        for (let i = 0; i < this.plugins.length; i++) {
-            promise = promise.then(() => this.runHook(hookName, args, i, false, replaceContext));
+        for (const plugin of this.plugins) {
+            promise = promise.then(() => this.runHook(hookName, args, plugin, false, replaceContext));
         }
         return promise;
     }
     // chains synchronously, ignores returns
     hookSeqSync(hookName, args, replaceContext) {
-        for (let i = 0; i < this.plugins.length; i++) {
-            this.runHookSync(hookName, args, i, replaceContext);
+        for (const plugin of this.plugins) {
+            this.runHookSync(hookName, args, plugin, replaceContext);
         }
     }
-    runHook(hookName, args, pluginIndex, permitValues, hookContext) {
-        const plugin = this.plugins[pluginIndex];
+    runHook(hookName, args, plugin, permitValues, hookContext) {
         const hook = plugin[hookName];
         if (!hook)
             return undefined;
-        let context = this.pluginContexts[pluginIndex];
+        let context = this.pluginContexts.get(plugin);
         if (hookContext) {
             context = hookContext(context, plugin);
         }
@@ -18705,15 +18726,14 @@ class PluginDriver {
      * Run a sync plugin hook and return the result.
      * @param hookName Name of the plugin hook. Must be in `PluginHooks`.
      * @param args Arguments passed to the plugin hook.
-     * @param pluginIndex Index of the plugin inside `this.plugins[]`.
+     * @param plugin The acutal plugin
      * @param hookContext When passed, the plugin context can be overridden.
      */
-    runHookSync(hookName, args, pluginIndex, hookContext) {
-        const plugin = this.plugins[pluginIndex];
+    runHookSync(hookName, args, plugin, hookContext) {
         const hook = plugin[hookName];
         if (!hook)
             return undefined;
-        let context = this.pluginContexts[pluginIndex];
+        let context = this.pluginContexts.get(plugin);
         if (hookContext) {
             context = hookContext(context, plugin);
         }
@@ -19021,7 +19041,7 @@ function markPureNode(node, comment) {
     else {
         node._rollupAnnotations = [{ comment }];
     }
-    if (node.type === ExpressionStatement$1) {
+    while (node.type === ExpressionStatement$1 || node.type === ChainExpression$1) {
         node = node.expression;
     }
     if (node.type === CallExpression$1 || node.type === NewExpression$1) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.41.5
-	Thu, 18 Mar 2021 05:07:55 GMT - commit e2ae914dfe84fd9601743e7ce15841bb483146c4
+	Rollup.js v2.42.3
+	Mon, 22 Mar 2021 14:48:44 GMT - commit f67e6c9b2cb4066f2ddcdb6d45308f840b2ac62f
 
 
 	https://github.com/rollup/rollup

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.41.5
-	Thu, 18 Mar 2021 05:07:55 GMT - commit e2ae914dfe84fd9601743e7ce15841bb483146c4
+	Rollup.js v2.42.3
+	Mon, 22 Mar 2021 14:48:44 GMT - commit f67e6c9b2cb4066f2ddcdb6d45308f840b2ac62f
 
 
 	https://github.com/rollup/rollup