rollup 2.34.2 → 2.36.1

package/dist/rollup.d.ts

@@ -354,6 +354,7 @@ export interface OutputBundleWithPlaceholders {
 export interface PluginHooks extends OutputPluginHooks {
 	buildEnd: (this: PluginContext, err?: Error) => Promise<void> | void;
 	buildStart: (this: PluginContext, options: NormalizedInputOptions) => Promise<void> | void;
+	closeBundle: (this: PluginContext) => Promise<void> | void;
 	closeWatcher: (this: PluginContext) => void;
 	load: LoadHook;
 	moduleParsed: ModuleParsedHook;
@@ -416,7 +417,8 @@ export type AsyncPluginHooks =
 	| 'resolveDynamicImport'
 	| 'resolveId'
 	| 'transform'
-	| 'writeBundle';
+	| 'writeBundle'
+	| 'closeBundle';
 
 export type PluginValueHooks = 'banner' | 'footer' | 'intro' | 'outro';
 
@@ -451,7 +453,8 @@ export type ParallelPluginHooks =
 	| 'outro'
 	| 'renderError'
 	| 'renderStart'
-	| 'writeBundle';
+	| 'writeBundle'
+	| 'closeBundle';
 
 interface OutputPluginValueHooks {
 	banner: AddonHook;
@@ -769,6 +772,8 @@ export interface RollupOutput {
 
 export interface RollupBuild {
 	cache: RollupCache | undefined;
+	close: () => Promise<void>;
+	closed: boolean;
 	generate: (outputOptions: OutputOptions) => Promise<RollupOutput>;
 	getTimings?: () => SerializedTimings;
 	watchFiles: string[];
@@ -852,7 +857,7 @@ export type RollupWatcherEvent =
 			result: RollupBuild;
 	  }
 	| { code: 'END' }
-	| { code: 'ERROR'; error: RollupError };
+	| { code: 'ERROR'; error: RollupError; result: RollupBuild | null };
 
 export interface RollupWatcher
 	extends TypedEventEmitter<{

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup
@@ -19,7 +19,7 @@ function _interopNamespaceDefaultOnly(e) {
   return {__proto__: null, 'default': e};
 }
 
-var version = "2.34.2";
+var version = "2.36.1";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -5282,6 +5282,7 @@ function augmentCodeLocation(props, pos, source, id) {
 }
 var Errors;
 (function (Errors) {
+    Errors["ALREADY_CLOSED"] = "ALREADY_CLOSED";
     Errors["ASSET_NOT_FINALISED"] = "ASSET_NOT_FINALISED";
     Errors["ASSET_NOT_FOUND"] = "ASSET_NOT_FOUND";
     Errors["ASSET_SOURCE_ALREADY_SET"] = "ASSET_SOURCE_ALREADY_SET";
@@ -5290,8 +5291,9 @@ var Errors;
     Errors["CANNOT_EMIT_FROM_OPTIONS_HOOK"] = "CANNOT_EMIT_FROM_OPTIONS_HOOK";
     Errors["CHUNK_NOT_GENERATED"] = "CHUNK_NOT_GENERATED";
     Errors["DEPRECATED_FEATURE"] = "DEPRECATED_FEATURE";
-    Errors["FILE_NOT_FOUND"] = "FILE_NOT_FOUND";
+    Errors["EXTERNAL_SYNTHETIC_EXPORTS"] = "EXTERNAL_SYNTHETIC_EXPORTS";
     Errors["FILE_NAME_CONFLICT"] = "FILE_NAME_CONFLICT";
+    Errors["FILE_NOT_FOUND"] = "FILE_NOT_FOUND";
     Errors["INPUT_HOOK_IN_OUTPUT_PLUGIN"] = "INPUT_HOOK_IN_OUTPUT_PLUGIN";
     Errors["INVALID_CHUNK"] = "INVALID_CHUNK";
     Errors["INVALID_EXPORT_OPTION"] = "INVALID_EXPORT_OPTION";
@@ -5305,12 +5307,11 @@ var Errors;
     Errors["NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE"] = "NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE";
     Errors["PLUGIN_ERROR"] = "PLUGIN_ERROR";
     Errors["PREFER_NAMED_EXPORTS"] = "PREFER_NAMED_EXPORTS";
+    Errors["SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT"] = "SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT";
     Errors["UNEXPECTED_NAMED_IMPORT"] = "UNEXPECTED_NAMED_IMPORT";
     Errors["UNRESOLVED_ENTRY"] = "UNRESOLVED_ENTRY";
     Errors["UNRESOLVED_IMPORT"] = "UNRESOLVED_IMPORT";
     Errors["VALIDATION_ERROR"] = "VALIDATION_ERROR";
-    Errors["EXTERNAL_SYNTHETIC_EXPORTS"] = "EXTERNAL_SYNTHETIC_EXPORTS";
-    Errors["SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT"] = "SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT";
 })(Errors || (Errors = {}));
 function errAssetNotFinalisedForFileName(name) {
     return {
@@ -5533,6 +5534,12 @@ function errFailedValidation(message) {
         message
     };
 }
+function errAlreadyClosed() {
+    return {
+        code: Errors.ALREADY_CLOSED,
+        message: 'Bundle is already closed, no more calls to "generate" or "write" are allowed.'
+    };
+}
 function warnDeprecation(deprecation, activeDeprecation, options) {
     warnDeprecationWithOptions(deprecation, activeDeprecation, options.onwarn, options.strictDeprecations);
 }
@@ -6194,12 +6201,28 @@ class AssignmentExpression extends NodeBase {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         this.included = true;
-        this.left.include(context, includeChildrenRecursively);
+        let hasEffectsContext;
+        if (includeChildrenRecursively ||
+            this.operator !== '=' ||
+            this.left.included ||
+            ((hasEffectsContext = createHasEffectsContext()),
+                this.left.hasEffects(hasEffectsContext) ||
+                    this.left.hasEffectsWhenAssignedAtPath(EMPTY_PATH, hasEffectsContext))) {
+            this.left.include(context, includeChildrenRecursively);
+        }
         this.right.include(context, includeChildrenRecursively);
     }
-    render(code, options) {
-        this.left.render(code, options);
-        this.right.render(code, options);
+    render(code, options, { renderedParentType } = BLANK) {
+        if (this.left.included) {
+            this.left.render(code, options);
+            this.right.render(code, options);
+        }
+        else {
+            this.right.render(code, options, {
+                renderedParentType: renderedParentType || this.parent.type
+            });
+            code.remove(this.start, this.right.start);
+        }
         if (options.format === 'system') {
             const exportNames = this.left.variable && options.exportNamesByVariable.get(this.left.variable);
             if (this.left.type === 'Identifier' && exportNames) {
@@ -18602,6 +18625,7 @@ function getPluginContexts(pluginCache, graph, options, fileEmitter) {
 const inputHookNames = {
     buildEnd: 1,
     buildStart: 1,
+    closeBundle: 1,
     closeWatcher: 1,
     load: 1,
     moduleParsed: 1,
@@ -19944,17 +19968,29 @@ async function rollupInternal(rawInputOptions, watcher) {
             err.watchFiles = watchFiles;
         }
         await graph.pluginDriver.hookParallel('buildEnd', [err]);
+        await graph.pluginDriver.hookParallel('closeBundle', []);
         throw err;
     }
     await graph.pluginDriver.hookParallel('buildEnd', []);
     timeEnd('BUILD', 1);
     const result = {
         cache: useCache ? graph.getCache() : undefined,
+        closed: false,
+        async close() {
+            if (result.closed)
+                return;
+            result.closed = true;
+            await graph.pluginDriver.hookParallel('closeBundle', []);
+        },
         async generate(rawOutputOptions) {
+            if (result.closed)
+                return error(errAlreadyClosed());
             return handleGenerateWrite(false, inputOptions, unsetInputOptions, rawOutputOptions, graph);
         },
         watchFiles: Object.keys(graph.watchFiles),
         async write(rawOutputOptions) {
+            if (result.closed)
+                return error(errAlreadyClosed());
             return handleGenerateWrite(true, inputOptions, unsetInputOptions, rawOutputOptions, graph);
         }
     };

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup
@@ -421,6 +421,9 @@ async function watch(command) {
                         loadConfigFile_js.stderr(`\n[${dateTime_1()}] waiting for changes...`);
                     }
             }
+            if ('result' in event && event.result) {
+                event.result.close().catch(error => loadConfigFile_js.handleError(error, true));
+            }
         });
     }
     function close(code) {

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.34.2
-	Sun, 06 Dec 2020 05:40:46 GMT - commit 92a2dfa8f18350373aa2329dec45e56bd076909d
+	Rollup.js v2.36.1
+	Wed, 06 Jan 2021 14:06:54 GMT - commit d6600638c61b5eb7f389681d5fa4af9a1b95823e
 
 
 	https://github.com/rollup/rollup
@@ -662,22 +662,13 @@ class Watcher {
         this.emitter.emit('event', {
             code: 'START'
         });
-        try {
-            for (const task of this.tasks) {
-                await task.run();
-            }
-            this.running = false;
-            this.emitter.emit('event', {
-                code: 'END'
-            });
-        }
-        catch (error) {
-            this.running = false;
-            this.emitter.emit('event', {
-                code: 'ERROR',
-                error
-            });
+        for (const task of this.tasks) {
+            await task.run();
         }
+        this.running = false;
+        this.emitter.emit('event', {
+            code: 'END'
+        });
         if (this.rerun) {
             this.rerun = false;
             this.invalidate();
@@ -738,8 +729,9 @@ class Task {
             input: this.options.input,
             output: this.outputFiles
         });
+        let result = null;
         try {
-            const result = await rollup.rollupInternal(options, this.watcher.emitter);
+            result = await rollup.rollupInternal(options, this.watcher.emitter);
             if (this.closed) {
                 return;
             }
@@ -754,18 +746,21 @@ class Task {
             });
         }
         catch (error) {
-            if (this.closed) {
-                return;
-            }
-            if (Array.isArray(error.watchFiles)) {
-                for (const id of error.watchFiles) {
-                    this.watchFile(id);
+            if (!this.closed) {
+                if (Array.isArray(error.watchFiles)) {
+                    for (const id of error.watchFiles) {
+                        this.watchFile(id);
+                    }
+                }
+                if (error.id) {
+                    this.cache.modules = this.cache.modules.filter(module => module.id !== error.id);
                 }
             }
-            if (error.id) {
-                this.cache.modules = this.cache.modules.filter(module => module.id !== error.id);
-            }
-            throw error;
+            this.watcher.emitter.emit('event', {
+                code: 'ERROR',
+                error,
+                result
+            });
         }
     }
     updateWatchedFiles(result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.34.2",
+  "version": "2.36.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -65,7 +65,7 @@
     "@rollup/plugin-node-resolve": "^10.0.0",
     "@rollup/plugin-replace": "^2.3.4",
     "@types/micromatch": "^4.0.1",
-    "@types/node": "^10.17.48",
+    "@types/node": "^10.17.49",
     "@types/require-relative": "^0.8.0",
     "@types/signal-exit": "^3.0.0",
     "@types/yargs-parser": "^15.0.0",
@@ -79,18 +79,18 @@
     "chokidar": "^3.4.3",
     "codecov": "^3.8.1",
     "colorette": "^1.2.1",
-    "core-js": "^3.8.0",
+    "core-js": "^3.8.1",
     "date-time": "^3.1.0",
     "es5-shim": "^4.5.14",
     "es6-shim": "^0.35.6",
-    "eslint": "^7.14.0",
+    "eslint": "^7.15.0",
     "eslint-plugin-import": "^2.22.1",
-    "execa": "^4.1.0",
+    "execa": "^5.0.0",
     "fixturify": "^2.1.0",
     "hash.js": "^1.1.7",
-    "husky": "^4.3.0",
+    "husky": "^4.3.6",
     "is-reference": "^1.2.1",
-    "lint-staged": "^10.5.2",
+    "lint-staged": "^10.5.3",
     "locate-character": "^2.0.5",
     "magic-string": "^0.25.7",
     "markdownlint-cli": "^0.25.0",
@@ -103,7 +103,7 @@
     "pretty-ms": "^7.0.1",
     "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^2.34.0",
+    "rollup": "^2.34.2",
     "rollup-plugin-license": "^2.2.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
@@ -120,7 +120,7 @@
     "terser": "^5.5.1",
     "tslib": "^2.0.3",
     "tslint": "^6.1.3",
-    "typescript": "^4.1.2",
+    "typescript": "^4.1.3",
     "url-parse": "^1.4.7",
     "weak-napi": "^2.0.2",
     "yargs-parser": "^20.2.4"