rollup 2.7.5 → 2.7.6

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.7.5
-	Wed, 29 Apr 2020 19:48:24 GMT - commit a2b48832de11ad38eacfeacad08ba4dfceecfe96
+	Rollup.js v2.7.6
+	Thu, 30 Apr 2020 18:55:10 GMT - commit 468010ba801b1e59573b6aa7319461a449aa43df
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.7.5
-	Wed, 29 Apr 2020 19:48:24 GMT - commit a2b48832de11ad38eacfeacad08ba4dfceecfe96
+	Rollup.js v2.7.6
+	Thu, 30 Apr 2020 18:55:10 GMT - commit 468010ba801b1e59573b6aa7319461a449aa43df
 
 
 	https://github.com/rollup/rollup
@@ -13,7 +13,7 @@ import { createHash as createHash$1 } from 'crypto';
 import { writeFile as writeFile$1, readdirSync, mkdirSync, readFile as readFile$1, lstatSync, realpathSync } from 'fs';
 import { EventEmitter } from 'events';
 
-var version = "2.7.5";
+var version = "2.7.6";
 
 // Reserved word lists for various dialects of the language
 
@@ -14832,7 +14832,9 @@ class Module {
             else if (variable instanceof ExportDefaultVariable) {
                 variable = variable.getOriginalVariable();
             }
-            relevantDependencies.add(variable.module);
+            if (variable.module) {
+                relevantDependencies.add(variable.module);
+            }
         }
         if (this.isEntryPoint || this.dynamicallyImportedBy.length > 0 || this.graph.preserveModules) {
             for (const exportName of [...this.getReexports(), ...this.getExports()]) {
@@ -14843,7 +14845,9 @@ class Module {
                 else if (variable instanceof ExportDefaultVariable) {
                     variable = variable.getOriginalVariable();
                 }
-                relevantDependencies.add(variable.module);
+                if (variable.module) {
+                    relevantDependencies.add(variable.module);
+                }
             }
         }
         if (this.graph.treeshakingOptions) {
@@ -16517,7 +16521,7 @@ class Chunk$1 {
             else if (variable instanceof ExportDefaultVariable) {
                 variable = variable.getOriginalVariable();
             }
-            if (variable.module.chunk !== this) {
+            if (variable.module && variable.module.chunk !== this) {
                 this.imports.add(variable);
                 if (!(variable instanceof NamespaceVariable && this.graph.preserveModules) &&
                     variable.module instanceof Module) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.7.5
-	Wed, 29 Apr 2020 19:48:24 GMT - commit a2b48832de11ad38eacfeacad08ba4dfceecfe96
+	Rollup.js v2.7.6
+	Thu, 30 Apr 2020 18:55:10 GMT - commit 468010ba801b1e59573b6aa7319461a449aa43df
 
 
 	https://github.com/rollup/rollup
@@ -3993,6 +3993,7 @@ const { promisify } = util;
 const readdir = promisify(fs.readdir);
 const stat = promisify(fs.stat);
 const lstat = promisify(fs.lstat);
+const realpath = promisify(fs.realpath);
 
 /**
  * @typedef {Object} EntryInfo
@@ -4090,11 +4091,7 @@ class ReaddirpStream extends Readable {
     this._rdOptions = { encoding: 'utf8', withFileTypes: this._isDirent };
 
     // Launch stream with one parent, the root dir.
-    try {
-      this.parents = [this._exploreDir(root, 1)];
-    } catch (error) {
-      this.destroy(error);
-    }
+    this.parents = [this._exploreDir(root, 1)];
     this.reading = false;
     this.parent = undefined;
   }
@@ -4110,7 +4107,10 @@ class ReaddirpStream extends Readable {
         if (files.length > 0) {
           const slice = files.splice(0, batch).map(dirent => this._formatEntry(dirent, path));
           for (const entry of await Promise.all(slice)) {
-            if (this._isDirAndMatchesFilter(entry)) {
+            if (this.destroyed) return;
+
+            const entryType = await this._getEntryType(entry);
+            if (entryType === 'directory' && this._directoryFilter(entry)) {
               if (depth <= this._maxDepth) {
                 this.parents.push(this._exploreDir(entry.fullPath, depth + 1));
               }
@@ -4119,7 +4119,7 @@ class ReaddirpStream extends Readable {
                 this.push(entry);
                 batch--;
               }
-            } else if (this._isFileAndMatchesFilter(entry)) {
+            } else if ((entryType === 'file' || this._includeAsFile(entry)) && this._fileFilter(entry)) {
               if (this._wantsFile) {
                 this.push(entry);
                 batch--;
@@ -4133,6 +4133,7 @@ class ReaddirpStream extends Readable {
             break;
           }
           this.parent = await parent;
+          if (this.destroyed) return;
         }
       }
     } catch (error) {
@@ -4153,10 +4154,11 @@ class ReaddirpStream extends Readable {
   }
 
   async _formatEntry(dirent, path$1) {
-    const basename = this._isDirent ? dirent.name : dirent;
-    const fullPath = path.resolve(path.join(path$1, basename));
-    const entry = {path: path.relative(this._root, fullPath), fullPath, basename};
+    let entry;
     try {
+      const basename = this._isDirent ? dirent.name : dirent;
+      const fullPath = path.resolve(path.join(path$1, basename));
+      entry = {path: path.relative(this._root, fullPath), fullPath, basename};
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
       this._onError(err);
@@ -4168,24 +4170,43 @@ class ReaddirpStream extends Readable {
     if (isNormalFlowError(err) && !this.destroyed) {
       this.emit('warn', err);
     } else {
-      throw err;
+      this.destroy(err);
     }
   }
 
-  _isDirAndMatchesFilter(entry) {
+  async _getEntryType(entry) {
     // entry may be undefined, because a warning or an error were emitted
     // and the statsProp is undefined
     const stats = entry && entry[this._statsProp];
-    return stats && stats.isDirectory() && this._directoryFilter(entry);
+    if (!stats) {
+      return;
+    }
+    if (stats.isFile()) {
+      return 'file';
+    }
+    if (stats.isDirectory()) {
+      return 'directory';
+    }
+    if (stats && stats.isSymbolicLink()) {
+      try {
+        const entryRealPath = await realpath(entry.fullPath);
+        const entryRealPathStats = await lstat(entryRealPath);
+        if (entryRealPathStats.isFile()) {
+          return 'file';
+        }
+        if (entryRealPathStats.isDirectory()) {
+          return 'directory';
+        }
+      } catch (error) {
+        this._onError(error);
+      }
+    }
   }
 
-  _isFileAndMatchesFilter(entry) {
+  _includeAsFile(entry) {
     const stats = entry && entry[this._statsProp];
-    const isFileType = stats && (
-      (this._wantsEverything && !stats.isDirectory()) ||
-      (stats.isFile() || stats.isSymbolicLink())
-    );
-    return isFileType && this._fileFilter(entry);
+
+    return stats && this._wantsEverything && !stats.isDirectory();
   }
 }
 
@@ -4779,6 +4800,7 @@ exports.FSEVENT_DELETED = 'deleted';
 exports.FSEVENT_MOVED = 'moved';
 exports.FSEVENT_CLONED = 'cloned';
 exports.FSEVENT_UNKNOWN = 'unknown';
+exports.FSEVENT_TYPE_FILE = 'file';
 exports.FSEVENT_TYPE_DIRECTORY = 'directory';
 exports.FSEVENT_TYPE_SYMLINK = 'symlink';
 
@@ -5477,6 +5499,7 @@ const {
   FSEVENT_MOVED,
   // FSEVENT_CLONED,
   FSEVENT_UNKNOWN,
+  FSEVENT_TYPE_FILE,
   FSEVENT_TYPE_DIRECTORY,
   FSEVENT_TYPE_SYMLINK,
 
@@ -5487,15 +5510,12 @@ const {
   EMPTY_FN: EMPTY_FN$1,
   IDENTITY_FN
 } = constants$2;
-const FS_MODE_READ = 'r';
 
 const Depth = (value) => isNaN(value) ? {} : {depth: value};
 
 const stat$2 = promisify$2(fs.stat);
-const open$1 = promisify$2(fs.open);
-const close$1 = promisify$2(fs.close);
 const lstat$2 = promisify$2(fs.lstat);
-const realpath = promisify$2(fs.realpath);
+const realpath$1 = promisify$2(fs.realpath);
 
 const statMethods$1 = { stat: stat$2, lstat: lstat$2 };
 
@@ -5642,6 +5662,14 @@ const calcDepth = (path$1, root) => {
   return i;
 };
 
+// returns boolean indicating whether the fsevents' event info has the same type
+// as the one returned by fs.stat
+const sameTypes = (info, stats) => (
+  info.type === FSEVENT_TYPE_DIRECTORY && stats.isDirectory() ||
+  info.type === FSEVENT_TYPE_SYMLINK && stats.isSymbolicLink() ||
+  info.type === FSEVENT_TYPE_FILE && stats.isFile()
+);
+
 /**
  * @mixin
  */
@@ -5672,13 +5700,16 @@ addOrChange(path, fullPath, realPath, parent, watchedDir, item, info, opts) {
   this.handleEvent(event, path, fullPath, realPath, parent, watchedDir, item, info, opts);
 }
 
-async checkFd(path, fullPath, realPath, parent, watchedDir, item, info, opts) {
+async checkExists(path, fullPath, realPath, parent, watchedDir, item, info, opts) {
   try {
-    const fd = await open$1(path, FS_MODE_READ);
+    const stats = await stat$2(path);
     if (this.fsw.closed) return;
-    await close$1(fd);
     if (this.fsw.closed) return;
-    this.addOrChange(path, fullPath, realPath, parent, watchedDir, item, info, opts);
+    if (sameTypes(info, stats)) {
+      this.addOrChange(path, fullPath, realPath, parent, watchedDir, item, info, opts);
+    } else {
+      this.handleEvent(EV_UNLINK, path, fullPath, realPath, parent, watchedDir, item, info, opts);
+    }
   } catch (error) {
     if (error.code === 'EACCES') {
       this.addOrChange(path, fullPath, realPath, parent, watchedDir, item, info, opts);
@@ -5692,9 +5723,10 @@ handleEvent(event, path, fullPath, realPath, parent, watchedDir, item, info, opt
   if (this.fsw.closed || this.checkIgnored(path)) return;
 
   if (event === EV_UNLINK) {
+    const isDirectory = info.type === FSEVENT_TYPE_DIRECTORY;
     // suppress unlink events on never before seen files
-    if (info.type === FSEVENT_TYPE_DIRECTORY || watchedDir.has(item)) {
-      this.fsw._remove(parent, item);
+    if (isDirectory || watchedDir.has(item)) {
+      this.fsw._remove(parent, item, isDirectory);
     }
   } else {
     if (event === EV_ADD$1) {
@@ -5759,13 +5791,13 @@ _watchWithFsEvents(watchPath, realPath, transform, globFilter) {
         } catch (error) {}
         if (this.fsw.closed) return;
         if (this.checkIgnored(path$1, stats)) return;
-        if (stats) {
+        if (sameTypes(info, stats)) {
           this.addOrChange(path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
         } else {
           this.handleEvent(EV_UNLINK, path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
         }
       } else {
-        this.checkFd(path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
+        this.checkExists(path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
       }
     } else {
       switch (info.event) {
@@ -5774,7 +5806,7 @@ _watchWithFsEvents(watchPath, realPath, transform, globFilter) {
         return this.addOrChange(path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
       case FSEVENT_DELETED:
       case FSEVENT_MOVED:
-        return this.checkFd(path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
+        return this.checkExists(path$1, fullPath, realPath, parent, watchedDir, item, info, opts);
       }
     }
   };
@@ -5807,7 +5839,7 @@ async _handleFsEventsSymlink(linkPath, fullPath, transform, curDepth) {
   this.fsw._incrReadyCount();
 
   try {
-    const linkTarget = await realpath(linkPath);
+    const linkTarget = await realpath$1(linkPath);
     if (this.fsw.closed) return;
     if (this.fsw._isIgnored(linkTarget)) {
       return this.fsw._emitReady();
@@ -5943,7 +5975,7 @@ async _addToFsEvents(path$1, transform, forceAdd, priorDepth) {
     } else {
       let realPath;
       try {
-        realPath = await realpath(wh.watchPath);
+        realPath = await realpath$1(wh.watchPath);
       } catch (e) {}
       this.initWatch(realPath, path$1, wh, processPath);
     }
@@ -6108,12 +6140,13 @@ class DirEntry {
     const {items} = this;
     if (!items) return;
     items.delete(item);
+    if (items.size > 0) return;
 
-    if (!items.size) {
-      const dir = this.path;
-      try {
-        await readdir$1(dir);
-      } catch (err) {
+    const dir = this.path;
+    try {
+      await readdir$1(dir);
+    } catch (err) {
+      if (this._removeWatcher) {
         this._removeWatcher(path.dirname(dir), path.basename(dir));
       }
     }
@@ -6439,7 +6472,7 @@ unwatch(paths_) {
  * @returns {Promise<void>}.
 */
 close() {
-  if (this.closed) return this;
+  if (this.closed) return this._closePromise;
   this.closed = true;
 
   // Memory management.
@@ -6457,7 +6490,9 @@ close() {
   ['closers', 'watched', 'streams', 'symlinkPaths', 'throttled'].forEach(key => {
     this[`_${key}`].clear();
   });
-  return closers.length ? Promise.all(closers).then(() => undefined) : Promise.resolve();
+
+  this._closePromise = closers.length ? Promise.all(closers).then(() => undefined) : Promise.resolve();
+  return this._closePromise;
 }
 
 /**
@@ -6558,16 +6593,15 @@ async _emit(event, path$1, val1, val2, val3) {
     (event === EV_ADD$2 || event === EV_ADD_DIR$2 || event === EV_CHANGE$2)
   ) {
     const fullPath = opts.cwd ? path.join(opts.cwd, path$1) : path$1;
+    let stats;
     try {
-      const stats = await stat$3(fullPath);
-      // Suppress event when fs_stat fails, to avoid sending undefined 'stat'
-      if (!stats) return;
-      args.push(stats);
-      this.emitWithAll(event, args);
+      stats = await stat$3(fullPath);
     } catch (err) {}
-  } else {
-    this.emitWithAll(event, args);
+    // Suppress event when fs_stat fails, to avoid sending undefined 'stat'
+    if (!stats || this.closed) return;
+    args.push(stats);
   }
+  this.emitWithAll(event, args);
 
   return this;
 }
@@ -6776,13 +6810,15 @@ _hasReadPermissions(stats) {
  * @param {String} item      base path of item/directory
  * @returns {void}
 */
-_remove(directory, item) {
+_remove(directory, item, isDirectory) {
   // if what is being deleted is a directory, get that directory's paths
   // for recursive deleting and cleaning of watched object
   // if it is not a directory, nestedDirectoryChildren will be empty array
   const path$1 = path.join(directory, item);
   const fullPath = path.resolve(path$1);
-  const isDirectory = this._watched.has(path$1) || this._watched.has(fullPath);
+  isDirectory = isDirectory != null
+    ? isDirectory
+    : this._watched.has(path$1) || this._watched.has(fullPath);
 
   // prevent duplicate handling in case of arriving here nearly simultaneously
   // via multiple paths (such as _handleFile and _handleDir)

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.7.5
-	Wed, 29 Apr 2020 19:48:24 GMT - commit a2b48832de11ad38eacfeacad08ba4dfceecfe96
+	Rollup.js v2.7.6
+	Thu, 30 Apr 2020 18:55:10 GMT - commit 468010ba801b1e59573b6aa7319461a449aa43df
 
 
 	https://github.com/rollup/rollup