rollup 2.32.1 → 2.33.3

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.32.1
-	Wed, 21 Oct 2020 07:32:18 GMT - commit 51e727c99bfc67a6bc46087c63950cec2a7fe12f
+	Rollup.js v2.33.3
+	Wed, 18 Nov 2020 05:54:45 GMT - commit 07868398277174501db6703d0bcdfc6b89d6fa6e
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.32.1
-	Wed, 21 Oct 2020 07:32:18 GMT - commit 51e727c99bfc67a6bc46087c63950cec2a7fe12f
+	Rollup.js v2.33.3
+	Wed, 18 Nov 2020 05:54:45 GMT - commit 07868398277174501db6703d0bcdfc6b89d6fa6e
 
 
 	https://github.com/rollup/rollup
@@ -13,7 +13,7 @@ import { createHash as createHash$1 } from 'crypto';
 import { writeFile as writeFile$1, readdirSync, mkdirSync, readFile as readFile$1, lstatSync, realpathSync } from 'fs';
 import { EventEmitter } from 'events';
 
-var version = "2.32.1";
+var version = "2.33.3";
 
 var charToInteger = {};
 var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -2338,7 +2338,8 @@ class ExternalModule {
             },
             isEntry: false,
             isExternal: true,
-            meta
+            meta,
+            syntheticNamedExports: false
         };
     }
     getVariableForExportName(name) {
@@ -4513,7 +4514,7 @@ class NamespaceVariable extends Variable {
         }
         const memberVariables = Object.create(null);
         for (const name of this.context.getExports().concat(this.context.getReexports())) {
-            if (name[0] !== '*' && name !== this.module.syntheticNamedExports) {
+            if (name[0] !== '*' && name !== this.module.info.syntheticNamedExports) {
                 memberVariables[name] = this.context.traceExport(name);
             }
         }
@@ -4892,6 +4893,16 @@ function getInteropBlock(dependencies, varOrConst, interop, externalLiveBindings
     return `${getHelpersBlock(neededInteropHelpers, accessedGlobals, _, n, s, t, externalLiveBindings, freeze, namespaceToStringTag)}${interopStatements.length > 0 ? `${interopStatements.join(n)}${n}${n}` : ''}`;
 }
 
+// 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) {
+    if (id[0] === '.' && id.endsWith('.js')) {
+        return id.slice(0, -3);
+    }
+    return id;
+}
+
 const builtins$1 = {
     assert: true,
     buffer: true,
@@ -4932,15 +4943,6 @@ function warnOnBuiltins(warn, dependencies) {
     });
 }
 
-// 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) {
-    if (id[0] === '.' && id.endsWith('.js')) {
-        return id.slice(0, -3);
-    }
-    return id;
-}
 function amd(magicString, { accessedGlobals, dependencies, exports, hasExports, indentString: t, intro, isEntryFacade, isModuleFacade, namedExportsMode, outro, varOrConst, warn }, { amd: { define: amdDefine, id: amdId }, compact, esModule, externalLiveBindings, freeze, interop, namespaceToStringTag, strict }) {
     warnOnBuiltins(warn, dependencies);
     const deps = dependencies.map(m => `'${removeExtensionFromRelativeAmdId(m.id)}'`);
@@ -5756,7 +5758,7 @@ function umd(magicString, { accessedGlobals, dependencies, exports, hasExports,
         });
     }
     warnOnBuiltins(warn, dependencies);
-    const amdDeps = dependencies.map(m => `'${m.id}'`);
+    const amdDeps = dependencies.map(m => `'${removeExtensionFromRelativeAmdId(m.id)}'`);
     const cjsDeps = dependencies.map(m => `require('${m.id}')`);
     const trimmedImports = trimEmptyImports(dependencies);
     const globalDeps = trimmedImports.map(module => globalProp(module.globalName, globalVar));
@@ -8733,6 +8735,7 @@ class TryStatement extends NodeBase {
     constructor() {
         super(...arguments);
         this.directlyIncluded = false;
+        this.includedLabelsAfterBlock = null;
     }
     hasEffects(context) {
         return ((this.context.options.treeshake.tryCatchDeoptimization
@@ -8748,8 +8751,16 @@ class TryStatement extends NodeBase {
             this.included = true;
             this.directlyIncluded = true;
             this.block.include(context, tryCatchDeoptimization ? INCLUDE_PARAMETERS : includeChildrenRecursively);
+            if (context.includedLabels.size > 0) {
+                this.includedLabelsAfterBlock = [...context.includedLabels];
+            }
             context.brokenFlow = brokenFlow;
         }
+        else if (this.includedLabelsAfterBlock) {
+            for (const label of this.includedLabelsAfterBlock) {
+                context.includedLabels.add(label);
+            }
+        }
         if (this.handler !== null) {
             this.handler.include(context, includeChildrenRecursively);
             context.brokenFlow = brokenFlow;
@@ -9668,7 +9679,6 @@ class Module {
         this.graph = graph;
         this.id = id;
         this.options = options;
-        this.syntheticNamedExports = syntheticNamedExports;
         this.ast = null;
         this.chunkFileNames = new Set();
         this.chunkName = null;
@@ -9738,7 +9748,8 @@ class Module {
             },
             isEntry,
             isExternal: false,
-            meta
+            meta,
+            syntheticNamedExports
         };
     }
     basename() {
@@ -9836,7 +9847,7 @@ class Module {
         }
         const exportNamesByVariable = new Map();
         for (const exportName of this.getAllExportNames()) {
-            if (exportName === this.syntheticNamedExports)
+            if (exportName === this.info.syntheticNamedExports)
                 continue;
             let tracedVariable = this.getVariableForExportName(exportName);
             if (tracedVariable instanceof ExportDefaultVariable) {
@@ -9895,14 +9906,17 @@ class Module {
     getSyntheticNamespace() {
         if (this.syntheticNamespace === null) {
             this.syntheticNamespace = undefined;
-            this.syntheticNamespace = this.getVariableForExportName(typeof this.syntheticNamedExports === 'string' ? this.syntheticNamedExports : 'default');
+            this.syntheticNamespace = this.getVariableForExportName(typeof this.info.syntheticNamedExports === 'string'
+                ? this.info.syntheticNamedExports
+                : 'default');
         }
         if (!this.syntheticNamespace) {
             return error({
                 code: Errors.SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT,
                 id: this.id,
-                message: `Module "${relativeId(this.id)}" that is marked with 'syntheticNamedExports: ${JSON.stringify(this.syntheticNamedExports)}' needs ${typeof this.syntheticNamedExports === 'string' && this.syntheticNamedExports !== 'default'
-                    ? `an export named "${this.syntheticNamedExports}"`
+                message: `Module "${relativeId(this.id)}" that is marked with 'syntheticNamedExports: ${JSON.stringify(this.info.syntheticNamedExports)}' needs ${typeof this.info.syntheticNamedExports === 'string' &&
+                    this.info.syntheticNamedExports !== 'default'
+                    ? `an export named "${this.info.syntheticNamedExports}"`
                     : 'a default export'}.`
             });
         }
@@ -9946,7 +9960,7 @@ class Module {
         // we don't want to create shims when we are just
         // probing export * modules for exports
         if (!isExportAllSearch) {
-            if (this.syntheticNamedExports) {
+            if (this.info.syntheticNamedExports) {
                 let syntheticExport = this.syntheticExports.get(name);
                 if (!syntheticExport) {
                     const syntheticNamespace = this.getSyntheticNamespace();
@@ -9978,7 +9992,7 @@ class Module {
             markModuleAndImpureDependenciesAsExecuted(this);
         }
         for (const exportName of this.getExports()) {
-            if (includeNamespaceMembers || exportName !== this.syntheticNamedExports) {
+            if (includeNamespaceMembers || exportName !== this.info.syntheticNamedExports) {
                 const variable = this.getVariableForExportName(exportName);
                 variable.deoptimizePath(UNKNOWN_PATH);
                 if (!variable.included) {
@@ -10104,7 +10118,7 @@ class Module {
             warn: this.warn.bind(this)
         };
         this.scope = new ModuleScope(this.graph.scope, this.astContext);
-        this.namespace = new NamespaceVariable(this.astContext, this.syntheticNamedExports);
+        this.namespace = new NamespaceVariable(this.astContext, this.info.syntheticNamedExports);
         this.ast = new Program$1(ast, { type: 'Module', context: this.astContext }, this.scope);
         this.info.ast = ast;
         timeEnd('analyse ast', 3);
@@ -10123,7 +10137,7 @@ class Module {
             originalSourcemap: this.originalSourcemap,
             resolvedIds: this.resolvedIds,
             sourcemapChain: this.sourcemapChain,
-            syntheticNamedExports: this.syntheticNamedExports,
+            syntheticNamedExports: this.info.syntheticNamedExports,
             transformDependencies: this.transformDependencies,
             transformFiles: this.transformFiles
         };
@@ -10152,7 +10166,7 @@ class Module {
             this.info.hasModuleSideEffects = moduleSideEffects;
         }
         if (syntheticNamedExports != null) {
-            this.syntheticNamedExports = syntheticNamedExports;
+            this.info.syntheticNamedExports = syntheticNamedExports;
         }
         if (meta != null) {
             this.info.meta = { ...this.info.meta, ...meta };
@@ -10302,7 +10316,7 @@ class Module {
                 this.imports.add(externalVariable);
                 mergedNamespaces.push(externalVariable);
             }
-            else if (module.syntheticNamedExports) {
+            else if (module.info.syntheticNamedExports) {
                 const syntheticNamespace = module.getSyntheticNamespace();
                 syntheticNamespace.include();
                 this.imports.add(syntheticNamespace);
@@ -10922,7 +10936,7 @@ class Chunk$1 {
                 if (!chunkModules.has(importer)) {
                     this.dynamicEntryModules.push(module);
                     // Modules with synthetic exports need an artificial namespace for dynamic imports
-                    if (module.syntheticNamedExports && !outputOptions.preserveModules) {
+                    if (module.info.syntheticNamedExports && !outputOptions.preserveModules) {
                         includedNamespaces.add(module);
                         this.exports.add(module.namespace);
                     }
@@ -11045,7 +11059,7 @@ class Chunk$1 {
             }
         }
         for (const module of this.dynamicEntryModules) {
-            if (module.syntheticNamedExports)
+            if (module.info.syntheticNamedExports)
                 continue;
             if (!this.facadeModule && this.canModuleBeFacade(module, exposedVariables)) {
                 this.facadeModule = module;
@@ -18467,6 +18481,7 @@ function getPluginContexts(pluginCache, graph, options, fileEmitter) {
             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,
@@ -18508,6 +18523,7 @@ function getPluginContexts(pluginCache, graph, options, fileEmitter) {
 const inputHookNames = {
     buildEnd: 1,
     buildStart: 1,
+    closeWatcher: 1,
     load: 1,
     moduleParsed: 1,
     options: 1,
@@ -18750,10 +18766,13 @@ class Graph {
         });
         if (watcher) {
             this.watchMode = true;
-            const handleChange = (id) => this.pluginDriver.hookSeqSync('watchChange', [id]);
+            const handleChange = (...args) => this.pluginDriver.hookSeqSync('watchChange', args);
+            const handleClose = () => this.pluginDriver.hookSeqSync('closeWatcher', []);
             watcher.on('change', handleChange);
+            watcher.on('close', handleClose);
             watcher.once('restart', () => {
                 watcher.removeListener('change', handleChange);
+                watcher.removeListener('close', handleClose);
             });
         }
         this.pluginDriver = new PluginDriver(this, options, options.plugins, this.pluginCache);

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.32.1
-	Wed, 21 Oct 2020 07:32:18 GMT - commit 51e727c99bfc67a6bc46087c63950cec2a7fe12f
+	Rollup.js v2.33.3
+	Wed, 18 Nov 2020 05:54:45 GMT - commit 07868398277174501db6703d0bcdfc6b89d6fa6e
 
 
 	https://github.com/rollup/rollup
@@ -7091,7 +7091,7 @@ class FileWatcher {
         const task = this.task;
         const isLinux = platform() === 'linux';
         const isTransformDependency = transformWatcherId !== null;
-        const handleChange = (id) => {
+        const handleChange = (id, event) => {
             const changedId = transformWatcherId || id;
             if (isLinux) {
                 // unwatching and watching fixes an issue with chokidar where on certain systems,
@@ -7100,22 +7100,39 @@ class FileWatcher {
                 watcher.unwatch(changedId);
                 watcher.add(changedId);
             }
-            task.invalidate(changedId, isTransformDependency);
+            task.invalidate(changedId, { isTransformDependency, event });
         };
         const watcher = chokidar
             .watch([], this.chokidarOptions)
-            .on('add', handleChange)
-            .on('change', handleChange)
-            .on('unlink', handleChange);
+            .on('add', id => handleChange(id, 'create'))
+            .on('change', id => handleChange(id, 'update'))
+            .on('unlink', id => handleChange(id, 'delete'));
         return watcher;
     }
 }
 
+const eventsRewrites = {
+    create: {
+        create: 'buggy',
+        delete: null,
+        update: 'create',
+    },
+    delete: {
+        create: 'update',
+        delete: 'buggy',
+        update: 'buggy',
+    },
+    update: {
+        create: 'buggy',
+        delete: 'delete',
+        update: 'update',
+    }
+};
 class Watcher {
     constructor(configs, emitter) {
         this.buildDelay = 0;
         this.buildTimeout = null;
-        this.invalidatedIds = new Set();
+        this.invalidatedIds = new Map();
         this.rerun = false;
         this.emitter = emitter;
         emitter.close = this.close.bind(this);
@@ -7132,14 +7149,25 @@ class Watcher {
         for (const task of this.tasks) {
             task.close();
         }
+        this.emitter.emit('close');
         this.emitter.removeAllListeners();
     }
-    emit(event, value) {
-        this.emitter.emit(event, value);
-    }
-    invalidate(id) {
-        if (id) {
-            this.invalidatedIds.add(id);
+    invalidate(file) {
+        if (file) {
+            const prevEvent = this.invalidatedIds.get(file.id);
+            const event = prevEvent
+                ? eventsRewrites[prevEvent][file.event]
+                : file.event;
+            if (event === 'buggy') {
+                //TODO: throws or warn? Currently just ignore, uses new event
+                this.invalidatedIds.set(file.id, file.event);
+            }
+            else if (event === null) {
+                this.invalidatedIds.delete(file.id);
+            }
+            else {
+                this.invalidatedIds.set(file.id, event);
+            }
         }
         if (this.running) {
             this.rerun = true;
@@ -7149,17 +7177,17 @@ class Watcher {
             clearTimeout(this.buildTimeout);
         this.buildTimeout = setTimeout(() => {
             this.buildTimeout = null;
-            for (const id of this.invalidatedIds) {
-                this.emit('change', id);
+            for (const [id, event] of this.invalidatedIds.entries()) {
+                this.emitter.emit('change', id, { event });
             }
             this.invalidatedIds.clear();
-            this.emit('restart');
+            this.emitter.emit('restart');
             this.run();
         }, this.buildDelay);
     }
     async run() {
         this.running = true;
-        this.emit('event', {
+        this.emitter.emit('event', {
             code: 'START'
         });
         try {
@@ -7167,13 +7195,13 @@ class Watcher {
                 await task.run();
             }
             this.running = false;
-            this.emit('event', {
+            this.emitter.emit('event', {
                 code: 'END'
             });
         }
         catch (error) {
             this.running = false;
-            this.emit('event', {
+            this.emitter.emit('event', {
                 code: 'ERROR',
                 error
             });
@@ -7212,9 +7240,9 @@ class Task {
         this.closed = true;
         this.fileWatcher.close();
     }
-    invalidate(id, isTransformDependency) {
+    invalidate(id, details) {
         this.invalidated = true;
-        if (isTransformDependency) {
+        if (details.isTransformDependency) {
             for (const module of this.cache.modules) {
                 if (module.transformDependencies.indexOf(id) === -1)
                     continue;
@@ -7222,7 +7250,7 @@ class Task {
                 module.originalCode = null;
             }
         }
-        this.watcher.invalidate(id);
+        this.watcher.invalidate({ id, event: details.event });
     }
     async run() {
         if (!this.invalidated)
@@ -7233,7 +7261,7 @@ class Task {
             cache: this.cache
         };
         const start = Date.now();
-        this.watcher.emit('event', {
+        this.watcher.emitter.emit('event', {
             code: 'BUNDLE_START',
             input: this.options.input,
             output: this.outputFiles
@@ -7245,7 +7273,7 @@ class Task {
             }
             this.updateWatchedFiles(result);
             this.skipWrite || (await Promise.all(this.outputs.map(output => result.write(output))));
-            this.watcher.emit('event', {
+            this.watcher.emitter.emit('event', {
                 code: 'BUNDLE_END',
                 duration: Date.now() - start,
                 input: this.options.input,

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.32.1
-	Wed, 21 Oct 2020 07:32:18 GMT - commit 51e727c99bfc67a6bc46087c63950cec2a7fe12f
+	Rollup.js v2.33.3
+	Wed, 18 Nov 2020 05:54:45 GMT - commit 07868398277174501db6703d0bcdfc6b89d6fa6e
 
 
 	https://github.com/rollup/rollup