rollup 2.69.2 → 2.70.0

package/dist/rollup.d.ts

@@ -344,7 +344,7 @@ export type WatchChangeHook = (
 	this: PluginContext,
 	id: string,
 	change: { event: ChangeEvent }
-) => void;
+) => Promise<void> | void;
 
 /**
  * use this type for plugin annotation
@@ -375,7 +375,7 @@ 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;
+	closeWatcher: (this: PluginContext) => Promise<void> | void;
 	load: LoadHook;
 	moduleParsed: ModuleParsedHook;
 	options: (
@@ -440,7 +440,9 @@ export type AsyncPluginHooks =
 	| 'shouldTransformCachedModule'
 	| 'transform'
 	| 'writeBundle'
-	| 'closeBundle';
+	| 'closeBundle'
+	| 'closeWatcher'
+	| 'watchChange';
 
 export type PluginValueHooks = 'banner' | 'footer' | 'intro' | 'outro';
 
@@ -458,13 +460,11 @@ export type FirstPluginHooks =
 
 export type SequentialPluginHooks =
 	| 'augmentChunkHash'
-	| 'closeWatcher'
 	| 'generateBundle'
 	| 'options'
 	| 'outputOptions'
 	| 'renderChunk'
-	| 'transform'
-	| 'watchChange';
+	| 'transform';
 
 export type ParallelPluginHooks =
 	| 'banner'
@@ -477,7 +477,9 @@ export type ParallelPluginHooks =
 	| 'renderError'
 	| 'renderStart'
 	| 'writeBundle'
-	| 'closeBundle';
+	| 'closeBundle'
+	| 'closeWatcher'
+	| 'watchChange';
 
 interface OutputPluginValueHooks {
 	banner: AddonHook;
@@ -898,6 +900,24 @@ interface TypedEventEmitter<T extends { [event: string]: (...args: any) => any }
 	setMaxListeners(n: number): this;
 }
 
+export interface RollupAwaitingEmitter<T extends { [event: string]: (...args: any) => any }>
+	extends TypedEventEmitter<T> {
+	close(): Promise<void>;
+	emitAndAwait<K extends keyof T>(event: K, ...args: Parameters<T[K]>): Promise<ReturnType<T[K]>[]>;
+	/**
+	 * Registers an event listener that will be awaited before Rollup continues
+	 * for events emitted via emitAndAwait. All listeners will be awaited in
+	 * parallel while rejections are tracked via Promise.all.
+	 * Listeners are removed automatically when removeAwaited is called, which
+	 * happens automatically after each run.
+	 */
+	onCurrentAwaited<K extends keyof T>(
+		event: K,
+		listener: (...args: Parameters<T[K]>) => Promise<ReturnType<T[K]>>
+	): this;
+	removeAwaited(): this;
+}
+
 export type RollupWatcherEvent =
 	| { code: 'START' }
 	| { code: 'BUNDLE_START'; input?: InputOption; output: readonly string[] }
@@ -911,15 +931,12 @@ export type RollupWatcherEvent =
 	| { code: 'END' }
 	| { code: 'ERROR'; error: RollupError; result: RollupBuild | null };
 
-export interface RollupWatcher
-	extends TypedEventEmitter<{
-		change: (id: string, change: { event: ChangeEvent }) => void;
-		close: () => void;
-		event: (event: RollupWatcherEvent) => void;
-		restart: () => void;
-	}> {
-	close(): void;
-}
+export type RollupWatcher = RollupAwaitingEmitter<{
+	change: (id: string, change: { event: ChangeEvent }) => void;
+	close: () => void;
+	event: (event: RollupWatcherEvent) => void;
+	restart: () => void;
+}>;
 
 export function watch(config: RollupWatchOptions | RollupWatchOptions[]): RollupWatcher;
 

package/dist/rollup.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 

package/dist/shared/mergeOptions.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 
@@ -28,7 +27,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-var version$1 = "2.69.2";
+var version$1 = "2.70.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -22790,12 +22789,6 @@ class PluginDriver {
         }
         return promise;
     }
-    // chains synchronously, ignores returns
-    hookSeqSync(hookName, args, replaceContext) {
-        for (const plugin of this.plugins) {
-            this.runHookSync(hookName, args, plugin, replaceContext);
-        }
-    }
     runHook(hookName, args, plugin, permitValues, hookContext) {
         const hook = plugin[hookName];
         if (!hook)
@@ -22928,14 +22921,10 @@ class Graph {
         }
         if (watcher) {
             this.watchMode = true;
-            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);
-            });
+            const handleChange = (...args) => this.pluginDriver.hookParallel('watchChange', args);
+            const handleClose = () => this.pluginDriver.hookParallel('closeWatcher', []);
+            watcher.onCurrentAwaited('change', handleChange);
+            watcher.onCurrentAwaited('close', handleClose);
         }
         this.pluginDriver = new PluginDriver(this, options, options.plugins, this.pluginCache);
         this.acornParser = Parser.extend(...options.acornInjectPlugins);
@@ -23740,12 +23729,30 @@ function defineConfig(options) {
 class WatchEmitter extends require$$0$2.EventEmitter {
     constructor() {
         super();
+        this.awaitedHandlers = Object.create(null);
         // Allows more than 10 bundles to be watched without
         // showing the `MaxListenersExceededWarning` to the user.
         this.setMaxListeners(Infinity);
     }
-    close() { }
+    // Will be overwritten by Rollup
+    async close() { }
+    emitAndAwait(event, ...args) {
+        this.emit(event, ...args);
+        return Promise.all(this.getHandlers(event).map(handler => handler(...args)));
+    }
+    onCurrentAwaited(event, listener) {
+        this.getHandlers(event).push(listener);
+        return this;
+    }
+    removeAwaited() {
+        this.awaitedHandlers = {};
+        return this;
+    }
+    getHandlers(event) {
+        return this.awaitedHandlers[event] || (this.awaitedHandlers[event] = []);
+    }
 }
+
 function watch(configs) {
     const emitter = new WatchEmitter();
     const configArray = ensureArray$1(configs);

package/dist/shared/watch-cli.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 
@@ -389,7 +388,7 @@ async function watch(command) {
                     return;
                 }
                 if (watcher) {
-                    watcher.close();
+                    await watcher.close();
                 }
                 start(options, warnings);
             }
@@ -455,12 +454,12 @@ async function watch(command) {
             }
         });
     }
-    function close(code) {
+    async function close(code) {
         process$2.removeListener('uncaughtException', close);
         // removing a non-existent listener is a no-op
         process$2.stdin.removeListener('end', close);
         if (watcher)
-            watcher.close();
+            await watcher.close();
         if (configWatcher)
             configWatcher.close();
         if (code) {

package/dist/shared/watch.js

@@ -1,8 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.2
-	Sun, 06 Mar 2022 06:43:03 GMT - commit 68817534499a6a1392c465d7fe92a1ef6804ad45
-
+	Rollup.js v2.70.0
+	Mon, 07 Mar 2022 06:21:56 GMT - commit 6d8924c8acd7fd124da5fa8026537e1c629f1515
 
 	https://github.com/rollup/rollup
 
@@ -113,13 +112,13 @@ class Watcher {
             : buildDelay, this.buildDelay);
         process.nextTick(() => this.run());
     }
-    close() {
+    async close() {
         if (this.buildTimeout)
             clearTimeout(this.buildTimeout);
         for (const task of this.tasks) {
             task.close();
         }
-        this.emitter.emit('close');
+        await this.emitter.emitAndAwait('close');
         this.emitter.removeAllListeners();
     }
     invalidate(file) {
@@ -143,14 +142,26 @@ class Watcher {
         }
         if (this.buildTimeout)
             clearTimeout(this.buildTimeout);
-        this.buildTimeout = setTimeout(() => {
+        this.buildTimeout = setTimeout(async () => {
             this.buildTimeout = null;
-            for (const [id, event] of this.invalidatedIds) {
-                this.emitter.emit('change', id, { event });
+            try {
+                await Promise.all([...this.invalidatedIds].map(([id, event]) => this.emitter.emitAndAwait('change', id, { event })));
+                this.invalidatedIds.clear();
+                this.emitter.emit('restart');
+                this.emitter.removeAwaited();
+                this.run();
+            }
+            catch (error) {
+                this.invalidatedIds.clear();
+                this.emitter.emit('event', {
+                    code: 'ERROR',
+                    error,
+                    result: null
+                });
+                this.emitter.emit('event', {
+                    code: 'END'
+                });
             }
-            this.invalidatedIds.clear();
-            this.emitter.emit('restart');
-            this.run();
         }, this.buildDelay);
     }
     async run() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.69.2",
+  "version": "2.70.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -9,7 +9,7 @@
     "rollup": "dist/bin/rollup"
   },
   "scripts": {
-    "build": "shx rm -rf dist && git rev-parse HEAD > .commithash && rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
+    "build": "shx rm -rf dist && node scripts/update-git-commit.js && rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
     "build:cjs": "shx rm -rf dist && rollup --config rollup.config.ts --configPlugin typescript --configTest && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
     "build:bootstrap": "node dist/bin/rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
     "ci:lint": "npm run lint:nofix",
@@ -22,10 +22,9 @@
     "perf": "npm run build:cjs && node --expose-gc scripts/perf.js",
     "perf:debug": "node --inspect-brk scripts/perf-debug.js",
     "perf:init": "node scripts/perf-init.js",
-    "_postinstall": "husky install",
-    "postpublish": "pinst --enable && git push && git push --tags",
+    "postpublish": "git push && git push --tags",
     "prepare": "husky install && npm run build",
-    "prepublishOnly": "pinst --disable && npm ci && npm run lint:nofix && npm run security && npm run build:bootstrap && npm run test:all",
+    "prepublishOnly": "npm ci && npm run lint:nofix && npm run security && npm run build:bootstrap && npm run test:all",
     "security": "npm audit",
     "test": "npm run build && npm run test:all",
     "test:cjs": "npm run build:cjs && npm run test:only",
@@ -97,7 +96,6 @@
     "magic-string": "^0.25.7",
     "mocha": "^9.2.1",
     "nyc": "^15.1.0",
-    "pinst": "^3.0.0",
     "prettier": "^2.5.1",
     "pretty-bytes": "^5.6.0",
     "pretty-ms": "^7.0.1",