rollup 2.70.2 → 2.72.0

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.70.2
-	Fri, 15 Apr 2022 05:14:21 GMT - commit 030c56fd6b186a0ddfd57d143ad703f34fd2c17a
+	Rollup.js v2.72.0
+	Thu, 05 May 2022 04:32:50 GMT - commit 19aef1315cf45b04c74c37a290cbef8072ddfa6b
 
 	https://github.com/rollup/rollup
 
@@ -18,10 +18,11 @@ const cli = require('../bin/rollup');
 const rollup = require('./rollup.js');
 const require$$0 = require('assert');
 const require$$0$1 = require('events');
-const loadConfigFile_js = require('./loadConfigFile.js');
-require('path');
+const loadConfigFile = require('./loadConfigFile.js');
+const child_process = require('child_process');
 require('util');
 require('stream');
+require('path');
 require('os');
 require('./mergeOptions.js');
 require('perf_hooks');
@@ -71,61 +72,68 @@ var signalExit = {exports: {}};
 
 var signals$1 = {exports: {}};
 
-(function (module) {
-// This is not the set of all possible signals.
-//
-// It IS, however, the set of all signals that trigger
-// an exit on either Linux or BSD systems.  Linux is a
-// superset of the signal names supported on BSD, and
-// the unknown signals just fail to register, so we can
-// catch that easily enough.
-//
-// Don't bother with SIGKILL.  It's uncatchable, which
-// means that we can't fire any callbacks anyway.
-//
-// If a user does happen to register a handler on a non-
-// fatal signal like SIGWINCH or something, and then
-// exit, it'll end up firing `process.emit('exit')`, so
-// the handler will be fired anyway.
-//
-// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
-// artificially, inherently leave the process in a
-// state from which it is not safe to try and enter JS
-// listeners.
-module.exports = [
-  'SIGABRT',
-  'SIGALRM',
-  'SIGHUP',
-  'SIGINT',
-  'SIGTERM'
-];
-
-if (process.platform !== 'win32') {
-  module.exports.push(
-    'SIGVTALRM',
-    'SIGXCPU',
-    'SIGXFSZ',
-    'SIGUSR2',
-    'SIGTRAP',
-    'SIGSYS',
-    'SIGQUIT',
-    'SIGIOT'
-    // should detect profiler and enable/disable accordingly.
-    // see #21
-    // 'SIGPROF'
-  );
-}
-
-if (process.platform === 'linux') {
-  module.exports.push(
-    'SIGIO',
-    'SIGPOLL',
-    'SIGPWR',
-    'SIGSTKFLT',
-    'SIGUNUSED'
-  );
+var hasRequiredSignals;
+
+function requireSignals () {
+	if (hasRequiredSignals) return signals$1.exports;
+	hasRequiredSignals = 1;
+	(function (module) {
+		// This is not the set of all possible signals.
+		//
+		// It IS, however, the set of all signals that trigger
+		// an exit on either Linux or BSD systems.  Linux is a
+		// superset of the signal names supported on BSD, and
+		// the unknown signals just fail to register, so we can
+		// catch that easily enough.
+		//
+		// Don't bother with SIGKILL.  It's uncatchable, which
+		// means that we can't fire any callbacks anyway.
+		//
+		// If a user does happen to register a handler on a non-
+		// fatal signal like SIGWINCH or something, and then
+		// exit, it'll end up firing `process.emit('exit')`, so
+		// the handler will be fired anyway.
+		//
+		// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
+		// artificially, inherently leave the process in a
+		// state from which it is not safe to try and enter JS
+		// listeners.
+		module.exports = [
+		  'SIGABRT',
+		  'SIGALRM',
+		  'SIGHUP',
+		  'SIGINT',
+		  'SIGTERM'
+		];
+
+		if (process.platform !== 'win32') {
+		  module.exports.push(
+		    'SIGVTALRM',
+		    'SIGXCPU',
+		    'SIGXFSZ',
+		    'SIGUSR2',
+		    'SIGTRAP',
+		    'SIGSYS',
+		    'SIGQUIT',
+		    'SIGIOT'
+		    // should detect profiler and enable/disable accordingly.
+		    // see #21
+		    // 'SIGPROF'
+		  );
+		}
+
+		if (process.platform === 'linux') {
+		  module.exports.push(
+		    'SIGIO',
+		    'SIGPOLL',
+		    'SIGPWR',
+		    'SIGSTKFLT',
+		    'SIGUNUSED'
+		  );
+		}
+} (signals$1));
+	return signals$1.exports;
 }
-}(signals$1));
 
 // Note: since nyc uses this module to output coverage, any lines
 // that are in the direct sync flow of nyc's outputCoverage are
@@ -153,7 +161,7 @@ if (!processOk(process$1)) {
   };
 } else {
   var assert = require$$0;
-  var signals = signals$1.exports;
+  var signals = requireSignals();
   var isWin = /^win/i.test(process$1.platform);
 
   var EE = require$$0$1;
@@ -330,8 +338,6 @@ if (!processOk(process$1)) {
   };
 }
 
-const onExit = signalExit.exports;
-
 const CLEAR_SCREEN = '\u001Bc';
 function getResetScreen(configs, allowClearScreen) {
     let clearScreen = allowClearScreen;
@@ -341,17 +347,44 @@ function getResetScreen(configs, allowClearScreen) {
         }
     }
     if (clearScreen) {
-        return (heading) => loadConfigFile_js.stderr(CLEAR_SCREEN + heading);
+        return (heading) => loadConfigFile.stderr(CLEAR_SCREEN + heading);
     }
     let firstRun = true;
     return (heading) => {
         if (firstRun) {
-            loadConfigFile_js.stderr(heading);
+            loadConfigFile.stderr(heading);
             firstRun = false;
         }
     };
 }
 
+function extractWatchHooks(command) {
+    if (!Array.isArray(command.watch))
+        return {};
+    return command.watch
+        .filter(value => typeof value === 'object')
+        .reduce((acc, keyValueOption) => ({ ...acc, ...keyValueOption }), {});
+}
+function createWatchHooks(command) {
+    const watchHooks = extractWatchHooks(command);
+    return function (hook) {
+        if (watchHooks[hook]) {
+            const cmd = watchHooks[hook];
+            if (!command.silent) {
+                loadConfigFile.stderr(loadConfigFile.cyan(`watch.${hook} ${loadConfigFile.bold(`$ ${cmd}`)}`));
+            }
+            try {
+                // !! important - use stderr for all writes from execSync
+                const stdio = [process.stdin, process.stderr, process.stderr];
+                child_process.execSync(cmd, { stdio: command.silent ? 'ignore' : stdio });
+            }
+            catch (e) {
+                loadConfigFile.stderr(e.message);
+            }
+        }
+    };
+}
+
 async function watch(command) {
     process$2.env.ROLLUP_WATCH = 'true';
     const isTTY = process$2.stderr.isTTY;
@@ -360,7 +393,8 @@ async function watch(command) {
     let configWatcher;
     let resetScreen;
     const configFile = command.config ? await cli.getConfigPath(command.config) : null;
-    onExit(close);
+    const runWatchHook = createWatchHooks(command);
+    signalExit.exports(close);
     process$2.on('uncaughtException', close);
     if (!process$2.stdin.isTTY) {
         process$2.stdin.on('end', close);
@@ -380,10 +414,10 @@ async function watch(command) {
                 configFileRevision++;
                 const currentConfigFileRevision = configFileRevision;
                 if (configFileData) {
-                    loadConfigFile_js.stderr(`\nReloading updated config...`);
+                    loadConfigFile.stderr(`\nReloading updated config...`);
                 }
                 configFileData = newConfigFileData;
-                const { options, warnings } = await loadConfigFile_js.loadAndParseConfigFile(configFile, command);
+                const { options, warnings } = await loadConfigFile.loadAndParseConfigFile(configFile, command);
                 if (currentConfigFileRevision !== configFileRevision) {
                     return;
                 }
@@ -393,7 +427,7 @@ async function watch(command) {
                 start(options, warnings);
             }
             catch (err) {
-                loadConfigFile_js.handleError(err, true);
+                loadConfigFile.handleError(err, true);
             }
         }
     }
@@ -409,21 +443,23 @@ async function watch(command) {
             watcher = rollup.watch(configs);
         }
         catch (err) {
-            return loadConfigFile_js.handleError(err);
+            return loadConfigFile.handleError(err);
         }
         watcher.on('event', event => {
             switch (event.code) {
                 case 'ERROR':
                     warnings.flush();
-                    loadConfigFile_js.handleError(event.error, true);
+                    loadConfigFile.handleError(event.error, true);
+                    runWatchHook('onError');
                     break;
                 case 'START':
                     if (!silent) {
                         if (!resetScreen) {
                             resetScreen = getResetScreen(configs, isTTY);
                         }
-                        resetScreen(loadConfigFile_js.underline(`rollup v${rollup.version}`));
+                        resetScreen(loadConfigFile.underline(`rollup v${rollup.version}`));
                     }
+                    runWatchHook('onStart');
                     break;
                 case 'BUNDLE_START':
                     if (!silent) {
@@ -433,24 +469,27 @@ async function watch(command) {
                                 ? input.join(', ')
                                 : Object.values(input).join(', ');
                         }
-                        loadConfigFile_js.stderr(loadConfigFile_js.cyan(`bundles ${loadConfigFile_js.bold(input)} → ${loadConfigFile_js.bold(event.output.map(rollup.relativeId).join(', '))}...`));
+                        loadConfigFile.stderr(loadConfigFile.cyan(`bundles ${loadConfigFile.bold(input)} → ${loadConfigFile.bold(event.output.map(rollup.relativeId).join(', '))}...`));
                     }
+                    runWatchHook('onBundleStart');
                     break;
                 case 'BUNDLE_END':
                     warnings.flush();
                     if (!silent)
-                        loadConfigFile_js.stderr(loadConfigFile_js.green(`created ${loadConfigFile_js.bold(event.output.map(rollup.relativeId).join(', '))} in ${loadConfigFile_js.bold(cli.ms(event.duration))}`));
+                        loadConfigFile.stderr(loadConfigFile.green(`created ${loadConfigFile.bold(event.output.map(rollup.relativeId).join(', '))} in ${loadConfigFile.bold(cli.ms(event.duration))}`));
+                    runWatchHook('onBundleEnd');
                     if (event.result && event.result.getTimings) {
                         cli.printTimings(event.result.getTimings());
                     }
                     break;
                 case 'END':
+                    runWatchHook('onEnd');
                     if (!silent && isTTY) {
-                        loadConfigFile_js.stderr(`\n[${dateTime()}] waiting for changes...`);
+                        loadConfigFile.stderr(`\n[${dateTime()}] waiting for changes...`);
                     }
             }
             if ('result' in event && event.result) {
-                event.result.close().catch(error => loadConfigFile_js.handleError(error, true));
+                event.result.close().catch(error => loadConfigFile.handleError(error, true));
             }
         });
     }

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.70.2
-	Fri, 15 Apr 2022 05:14:21 GMT - commit 030c56fd6b186a0ddfd57d143ad703f34fd2c17a
+	Rollup.js v2.72.0
+	Thu, 05 May 2022 04:32:50 GMT - commit 19aef1315cf45b04c74c37a290cbef8072ddfa6b
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.70.2",
+  "version": "2.72.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -59,9 +59,9 @@
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-commonjs": "^21.0.3",
+    "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.2.0",
+    "@rollup/plugin-node-resolve": "^13.2.1",
     "@rollup/plugin-replace": "^4.0.0",
     "@rollup/plugin-typescript": "^8.3.2",
     "@rollup/pluginutils": "^4.2.1",
@@ -69,25 +69,25 @@
     "@types/node": "^10.17.60",
     "@types/signal-exit": "^3.0.1",
     "@types/yargs-parser": "^20.2.2",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
-    "@typescript-eslint/parser": "^5.19.0",
-    "acorn": "^8.7.0",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
+    "acorn": "^8.7.1",
     "acorn-jsx": "^5.3.2",
     "acorn-walk": "^8.2.0",
     "buble": "^0.20.0",
     "chokidar": "^3.5.3",
     "colorette": "^2.0.16",
-    "core-js": "^3.22.0",
+    "core-js": "^3.22.3",
     "date-time": "^4.0.0",
-    "es5-shim": "^4.6.5",
+    "es5-shim": "^4.6.6",
     "es6-shim": "^0.35.6",
-    "eslint": "^8.13.0",
+    "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.0.0",
     "execa": "^5.1.1",
     "fixturify": "^2.1.1",
-    "fs-extra": "^10.0.1",
+    "fs-extra": "^10.1.0",
     "hash.js": "^1.1.7",
     "husky": "^7.0.4",
     "is-reference": "^3.0.0",
@@ -100,7 +100,7 @@
     "pretty-bytes": "^5.6.0",
     "pretty-ms": "^7.0.1",
     "requirejs": "^2.3.6",
-    "rollup": "^2.70.1",
+    "rollup": "^2.70.2",
     "rollup-plugin-license": "^2.7.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
@@ -111,9 +111,9 @@
     "source-map-support": "^0.5.21",
     "sourcemap-codec": "^1.4.8",
     "systemjs": "^6.12.1",
-    "terser": "^5.12.1",
-    "tslib": "^2.3.1",
-    "typescript": "^4.6.3",
+    "terser": "^5.13.0",
+    "tslib": "^2.4.0",
+    "typescript": "^4.6.4",
     "weak-napi": "^2.0.2",
     "yargs-parser": "^20.2.9"
   },
@@ -136,6 +136,8 @@
       },
       "default": "./dist/es/rollup.browser.js"
     },
+    "./loadConfigFile": "./dist/loadConfigFile.js",
+    "./dist/loadConfigFile": "./dist/loadConfigFile.js",
     "./dist/*": "./dist/*"
   }
 }