rollup 2.32.1 → 2.33.3

package/dist/rollup.d.ts

@@ -171,6 +171,7 @@ interface ModuleInfo {
 	isEntry: boolean;
 	isExternal: boolean;
 	meta: CustomPluginOptions;
+	syntheticNamedExports: boolean | string;
 }
 
 export type GetModuleInfo = (moduleId: string) => ModuleInfo | null;
@@ -195,6 +196,7 @@ export interface PluginContext extends MinimalPluginContext {
 	getFileName: (fileReferenceId: string) => string;
 	getModuleIds: () => IterableIterator<string>;
 	getModuleInfo: GetModuleInfo;
+	getWatchFiles: () => string[];
 	/** @deprecated Use `this.resolve` instead */
 	isExternal: IsExternal;
 	/** @deprecated Use `this.getModuleIds` instead */
@@ -318,6 +320,9 @@ export type ResolveFileUrlHook = (
 export type AddonHookFunction = (this: PluginContext) => string | Promise<string>;
 export type AddonHook = string | AddonHookFunction;
 
+export type ChangeEvent = 'create' | 'update' | 'delete'
+export type WatchChangeHook = (this: PluginContext, id: string, change: {event: ChangeEvent}) => void
+
 /**
  * use this type for plugin annotation
  * @example
@@ -345,13 +350,17 @@ export interface OutputBundleWithPlaceholders {
 export interface PluginHooks extends OutputPluginHooks {
 	buildEnd: (this: PluginContext, err?: Error) => Promise<void> | void;
 	buildStart: (this: PluginContext, options: NormalizedInputOptions) => Promise<void> | void;
+	closeWatcher: (this: PluginContext) => void;
 	load: LoadHook;
 	moduleParsed: ModuleParsedHook;
-	options: (this: MinimalPluginContext, options: InputOptions) => InputOptions | null | undefined;
+	options: (
+		this: MinimalPluginContext,
+		options: InputOptions
+	) => Promise<InputOptions | null | undefined> | InputOptions | null | undefined;
 	resolveDynamicImport: ResolveDynamicImportHook;
 	resolveId: ResolveIdHook;
 	transform: TransformHook;
-	watchChange: (id: string) => void;
+	watchChange: WatchChangeHook;
 }
 
 interface OutputPluginHooks {
@@ -391,6 +400,7 @@ interface OutputPluginHooks {
 }
 
 export type AsyncPluginHooks =
+	| 'options'
 	| 'buildEnd'
 	| 'buildStart'
 	| 'generateBundle'
@@ -419,6 +429,7 @@ export type FirstPluginHooks =
 
 export type SequentialPluginHooks =
 	| 'augmentChunkHash'
+	| 'closeWatcher'
 	| 'generateBundle'
 	| 'options'
 	| 'outputOptions'
@@ -783,9 +794,9 @@ export interface RollupWatchOptions extends InputOptions {
 	watch?: WatcherOptions | false;
 }
 
-interface TypedEventEmitter<T> {
+interface TypedEventEmitter<T extends {[event: string]: (...args: any) => any}> {
 	addListener<K extends keyof T>(event: K, listener: T[K]): this;
-	emit<K extends keyof T>(event: K, ...args: any[]): boolean;
+	emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>): boolean;
 	eventNames(): Array<keyof T>;
 	getMaxListeners(): number;
 	listenerCount(type: keyof T): number;
@@ -803,11 +814,11 @@ interface TypedEventEmitter<T> {
 
 export type RollupWatcherEvent =
 	| { code: 'START' }
-	| { code: 'BUNDLE_START'; input: InputOption; output: readonly string[] }
+	| { code: 'BUNDLE_START'; input?: InputOption; output: readonly string[] }
 	| {
 			code: 'BUNDLE_END';
 			duration: number;
-			input: InputOption;
+			input?: InputOption;
 			output: readonly string[];
 			result: RollupBuild;
 	  }
@@ -816,7 +827,8 @@ export type RollupWatcherEvent =
 
 export interface RollupWatcher
 	extends TypedEventEmitter<{
-		change: (id: string) => void;
+		change: (id: string, change: {event: ChangeEvent}) => void;
+		close: () => void;
 		event: (event: RollupWatcherEvent) => void;
 		restart: () => void;
 	}> {

package/dist/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/shared/index.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/shared/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

package/dist/shared/mergeOptions.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/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
@@ -19,7 +19,7 @@ function _interopNamespaceDefaultOnly(e) {
   return {__proto__: null, 'default': e};
 }
 
-var version = "2.32.1";
+var version = "2.33.3";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -2415,7 +2415,8 @@ class ExternalModule {
             },
             isEntry: false,
             isExternal: true,
-            meta
+            meta,
+            syntheticNamedExports: false
         };
     }
     getVariableForExportName(name) {
@@ -4590,7 +4591,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);
             }
         }
@@ -4969,6 +4970,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,
@@ -5009,15 +5020,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)}'`);
@@ -5812,7 +5814,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));
@@ -8789,6 +8791,7 @@ class TryStatement extends NodeBase {
     constructor() {
         super(...arguments);
         this.directlyIncluded = false;
+        this.includedLabelsAfterBlock = null;
     }
     hasEffects(context) {
         return ((this.context.options.treeshake.tryCatchDeoptimization
@@ -8804,8 +8807,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;
@@ -9724,7 +9735,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;
@@ -9794,7 +9804,8 @@ class Module {
             },
             isEntry,
             isExternal: false,
-            meta
+            meta,
+            syntheticNamedExports
         };
     }
     basename() {
@@ -9892,7 +9903,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) {
@@ -9951,14 +9962,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'}.`
             });
         }
@@ -10002,7 +10016,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();
@@ -10034,7 +10048,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) {
@@ -10160,7 +10174,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);
@@ -10179,7 +10193,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
         };
@@ -10208,7 +10222,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 };
@@ -10358,7 +10372,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);
@@ -10978,7 +10992,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);
                     }
@@ -11101,7 +11115,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;
@@ -18523,6 +18537,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,
@@ -18564,6 +18579,7 @@ function getPluginContexts(pluginCache, graph, options, fileEmitter) {
 const inputHookNames = {
     buildEnd: 1,
     buildStart: 1,
+    closeWatcher: 1,
     load: 1,
     moduleParsed: 1,
     options: 1,
@@ -18806,10 +18822,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/shared/watch-cli.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/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
@@ -565,7 +565,7 @@ class FileWatcher {
         const task = this.task;
         const isLinux = require$$1.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,
@@ -574,22 +574,39 @@ class FileWatcher {
                 watcher.unwatch(changedId);
                 watcher.add(changedId);
             }
-            task.invalidate(changedId, isTransformDependency);
+            task.invalidate(changedId, { isTransformDependency, event });
         };
         const watcher = index.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);
@@ -606,14 +623,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;
@@ -623,17 +651,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 {
@@ -641,13 +669,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
             });
@@ -686,9 +714,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;
@@ -696,7 +724,7 @@ class Task {
                 module.originalCode = null;
             }
         }
-        this.watcher.invalidate(id);
+        this.watcher.invalidate({ id, event: details.event });
     }
     async run() {
         if (!this.invalidated)
@@ -707,7 +735,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
@@ -719,7 +747,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/package.json

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