rollup 2.61.1 → 2.65.0

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.1
-	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
+	Rollup.js v2.65.0
+	Fri, 21 Jan 2022 07:42:35 GMT - commit bebc50ddb613d240a03988d51787fd71b1a3914f
 
 
 	https://github.com/rollup/rollup
@@ -22,10 +22,10 @@ require('util');
 require('stream');
 require('os');
 require('./mergeOptions.js');
-require('module');
+require('process');
+require('perf_hooks');
 require('crypto');
 require('url');
-require('process');
 require('tty');
 
 function timeZone(date = new Date()) {
@@ -353,10 +353,9 @@ async function watch(command) {
     process.env.ROLLUP_WATCH = 'true';
     const isTTY = process.stderr.isTTY;
     const silent = command.silent;
-    let configs;
-    let warnings;
     let watcher;
     let configWatcher;
+    let resetScreen;
     const configFile = command.config ? cli.getConfigPath(command.config) : null;
     onExit(close);
     process.on('uncaughtException', close);
@@ -365,10 +364,9 @@ async function watch(command) {
         process.stdin.resume();
     }
     async function loadConfigFromFileAndTrack(configFile) {
-        let reloadingConfig = false;
-        let aborted = false;
         let configFileData = null;
-        configWatcher = index.chokidar.watch(configFile).on('change', () => reloadConfigFile());
+        let configFileRevision = 0;
+        configWatcher = index.chokidar.watch(configFile).on('change', reloadConfigFile);
         await reloadConfigFile();
         async function reloadConfigFile() {
             try {
@@ -376,31 +374,22 @@ async function watch(command) {
                 if (newConfigFileData === configFileData) {
                     return;
                 }
-                if (reloadingConfig) {
-                    aborted = true;
-                    return;
-                }
+                configFileRevision++;
+                const currentConfigFileRevision = configFileRevision;
                 if (configFileData) {
                     loadConfigFile_js.stderr(`\nReloading updated config...`);
                 }
                 configFileData = newConfigFileData;
-                reloadingConfig = true;
-                ({ options: configs, warnings } = await loadConfigFile_js.loadAndParseConfigFile(configFile, command));
-                reloadingConfig = false;
-                if (aborted) {
-                    aborted = false;
-                    reloadConfigFile();
+                const { options, warnings } = await loadConfigFile_js.loadAndParseConfigFile(configFile, command);
+                if (currentConfigFileRevision !== configFileRevision) {
+                    return;
                 }
-                else {
-                    if (watcher) {
-                        watcher.close();
-                    }
-                    start(configs);
+                if (watcher) {
+                    watcher.close();
                 }
+                start(options, warnings);
             }
             catch (err) {
-                configs = [];
-                reloadingConfig = false;
                 loadConfigFile_js.handleError(err, true);
             }
         }
@@ -409,11 +398,10 @@ async function watch(command) {
         await loadConfigFromFileAndTrack(configFile);
     }
     else {
-        ({ options: configs, warnings } = await cli.loadConfigFromCommand(command));
-        start(configs);
+        const { options, warnings } = await cli.loadConfigFromCommand(command);
+        start(options, warnings);
     }
-    const resetScreen = getResetScreen(configs, isTTY);
-    function start(configs) {
+    function start(configs, warnings) {
         try {
             watcher = rollup.watch(configs);
         }
@@ -428,6 +416,9 @@ async function watch(command) {
                     break;
                 case 'START':
                     if (!silent) {
+                        if (!resetScreen) {
+                            resetScreen = getResetScreen(configs, isTTY);
+                        }
                         resetScreen(loadConfigFile_js.underline(`rollup v${rollup.version}`));
                     }
                     break;

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.1
-	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
+	Rollup.js v2.65.0
+	Fri, 21 Jan 2022 07:42:35 GMT - commit bebc50ddb613d240a03988d51787fd71b1a3914f
 
 
 	https://github.com/rollup/rollup
@@ -10,30 +10,19 @@
 */
 'use strict';
 
-const path = require('path');
+const require$$0 = require('path');
 const rollup = require('./rollup.js');
 const mergeOptions = require('./mergeOptions.js');
 const require$$2 = require('os');
 const index = require('./index.js');
+require('process');
+require('perf_hooks');
 require('crypto');
 require('fs');
 require('events');
 require('util');
 require('stream');
 
-function _interopNamespaceDefault(e) {
-    const n = Object.create(null);
-    if (e) {
-        for (const k in e) {
-            n[k] = e[k];
-        }
-    }
-    n.default = e;
-    return n;
-}
-
-const path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
-
 class FileWatcher {
     constructor(task, chokidarOptions) {
         this.transformWatchers = new Map();
@@ -56,8 +45,9 @@ class FileWatcher {
         }
     }
     watch(id, isTransformDependency) {
+        var _a;
         if (isTransformDependency) {
-            const watcher = this.transformWatchers.get(id) || this.createWatcher(id);
+            const watcher = (_a = this.transformWatchers.get(id)) !== null && _a !== void 0 ? _a : this.createWatcher(id);
             watcher.add(id);
             this.transformWatchers.set(id, watcher);
         }
@@ -192,7 +182,7 @@ class Task {
         this.outputs = this.options.output;
         this.outputFiles = this.outputs.map(output => {
             if (output.file || output.dir)
-                return path__namespace.resolve(output.file || output.dir);
+                return require$$0.resolve(output.file || output.dir);
             return undefined;
         });
         const watchOptions = this.options.watch || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.61.1",
+  "version": "2.65.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -58,33 +58,32 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^3.1.8",
+    "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-buble": "^0.21.3",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.6",
-    "@rollup/plugin-replace": "^3.0.0",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-replace": "^3.0.1",
     "@rollup/plugin-typescript": "^8.2.5",
-    "@rollup/pluginutils": "^4.1.1",
+    "@rollup/pluginutils": "^4.1.2",
     "@types/node": "^10.17.60",
-    "@types/require-relative": "^0.8.0",
     "@types/signal-exit": "^3.0.1",
     "@types/yargs-parser": "^20.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
-    "acorn": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
+    "acorn": "^8.7.0",
     "acorn-jsx": "^5.3.2",
     "acorn-walk": "^8.2.0",
     "buble": "^0.20.0",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "colorette": "^2.0.16",
-    "core-js": "^3.18.3",
+    "core-js": "^3.20.3",
     "date-time": "^4.0.0",
-    "es5-shim": "^4.6.2",
+    "es5-shim": "^4.6.4",
     "es6-shim": "^0.35.6",
-    "eslint": "^8.4.1",
+    "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "execa": "^5.1.1",
     "fixturify": "^2.1.1",
@@ -94,21 +93,20 @@
     "lint-staged": "^10.5.4",
     "locate-character": "^2.0.5",
     "magic-string": "^0.25.7",
-    "mocha": "^9.1.3",
+    "mocha": "^9.1.4",
     "nyc": "^15.1.0",
     "pinst": "^2.1.6",
     "prettier": "^2.5.1",
     "pretty-bytes": "^5.6.0",
     "pretty-ms": "^7.0.1",
-    "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^2.60.2",
-    "rollup-plugin-license": "^2.5.0",
+    "rollup": "^2.64.0",
+    "rollup-plugin-license": "^2.6.1",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-thatworks": "^1.0.4",
     "sander": "^0.6.0",
-    "shx": "^0.3.3",
+    "shx": "^0.3.4",
     "signal-exit": "^3.0.6",
     "source-map": "^0.7.3",
     "source-map-support": "^0.5.21",
@@ -116,7 +114,7 @@
     "systemjs": "^6.11.0",
     "terser": "^5.10.0",
     "tslib": "^2.3.1",
-    "typescript": "^4.5.2",
+    "typescript": "^4.5.5",
     "weak-napi": "^2.0.2",
     "yargs-parser": "^20.2.9"
   },