rollup 0.55.1 → 0.55.5

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # rollup changelog
 
+## 0.55.5
+* Remove OpenCollective dependency ([#1915](https://github.com/rollup/rollup/pull/1915))
+
+## 0.55.4
+* Improve name deconflicting of external variables ([#1930](https://github.com/rollup/rollup/pull/1930))
+* Improve re-export handling ([#1947](https://github.com/rollup/rollup/pull/1947))
+* Mark preserveSymlinks option as optional ([#1939](https://github.com/rollup/rollup/pull/1939))
+* Enable code-splitting tests to check directory structures ([#1924](https://github.com/rollup/rollup/pull/1924))
+* Improve TypeScript definition test ([#1954](https://github.com/rollup/rollup/pull/1954))
+
+## 0.55.3
+* Remove OpenCollective dependency ([#1915](https://github.com/rollup/rollup/pull/1915))
+
+## 0.55.2
+* Add option to not follow symlinks ([#1819](https://github.com/rollup/rollup/pull/1819))
+* Fix crash in windows shell ([#1928](https://github.com/rollup/rollup/pull/1928))
+* Fix and test for external TypeScript errors ([#1903](https://github.com/rollup/rollup/pull/1903))
+* Activate OpenCollective ([#1915](https://github.com/rollup/rollup/pull/1915))
+* Optimize CI scripts ([#1921](https://github.com/rollup/rollup/pull/1921))
+
 ## 0.55.1
 * Improve dynamic import workflow ([#1907](https://github.com/rollup/rollup/pull/1907))
 * Properly handle multiple dynamic imports of the same module ([#1911](https://github.com/rollup/rollup/pull/1911))

package/README.md

@@ -6,7 +6,7 @@
          alt="build status">
   </a>
   <a href="https://www.npmjs.com/package/rollup">
-    <img src="https://img.shields.io/npm/v/rollup.svg"
+    <a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/rollup/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/rollup/sponsors/badge.svg" /></a> <img src="https://img.shields.io/npm/v/rollup.svg"
          alt="npm version">
   </a>
   <a href="https://github.com/rollup/rollup/blob/master/LICENSE.md">
@@ -17,15 +17,21 @@
     <img src="https://david-dm.org/rollup/rollup/status.svg"
          alt="dependency status">
   </a>
-  <a href="https://codecov.io/github/rollup/rollup?branch=master">
-    <img src="https://codecov.io/gh/rollup/rollup/branch/master/graph/badge.svg" alt="Coverage via Codecov" />
-  </a>
   <a href='https://gitter.im/rollup/rollup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge'>
     <img src='https://badges.gitter.im/rollup/rollup.svg'
          alt='Join the chat at https://gitter.im/rollup/rollup'>
   </a>
+  <a href='https://opencollective.com/rollup/backers'>
+    <img src='https://opencollective.com/rollup/backers/badge.svg'
+         alt='Backers on Open Collective'>
+  </a>
+  <a href='https://opencollective.com/rollup/sponsors'>
+    <img src='https://opencollective.com/rollup/sponsors/badge.svg'
+         alt='Sponsors on Open Collective'>
+  </a>
 </p>
 
+
 ## Overview
 
 Rollup is a module bundler for JavaScript which compiles small pieces of code into something larger and more complex, such as a library or application. It uses the new standardized format for code modules included in the ES6 revision of JavaScript, instead of previous idiosyncratic solutions such as CommonJS and AMD. ES6 modules let you freely and seamlessly combine the most useful individual functions from your favorite libraries. This will eventually be possible natively, but Rollup lets you do it today.
@@ -106,6 +112,36 @@ To make sure your ES6 modules are immediately usable by tools that work with Com
 - step-by-step [tutorial video series](https://code.lengstorf.com/learn-rollup-js/), with accompanying written walkthrough
 - miscellaneous issues in the [wiki](https://github.com/rollup/rollup/wiki)
 
+## Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/rollup/rollup/graphs/contributors"><img src="https://opencollective.com/rollup/contributors.svg?width=890" /></a>
+
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/rollup#backer)]
+
+<a href="https://opencollective.com/rollup#backers" target="_blank"><img src="https://opencollective.com/rollup/backers.svg?width=890"></a>
+
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/rollup#sponsor)]
+
+<a href="https://opencollective.com/rollup/sponsor/0/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/1/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/2/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/3/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/4/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/5/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/6/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/7/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/8/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/rollup/sponsor/9/website" target="_blank"><img src="https://opencollective.com/rollup/sponsor/9/avatar.svg"></a>
+
+
+
 ## License
 
 [MIT](https://github.com/rollup/rollup/blob/master/LICENSE.md)

package/bin/rollup

@@ -250,7 +250,7 @@ function isNumber (x) {
 
 var help = "rollup version __VERSION__\n=====================================\n\nUsage: rollup [options] <entry file>\n\nBasic options:\n\n-v, --version               Show version number\n-h, --help                  Show this help message\n-c, --config                Use this config file (if argument is used but value\n                              is unspecified, defaults to rollup.config.js)\n-w, --watch                 Watch files in bundle and rebuild on changes\n-i, --input                 Input (alternative to <entry file>)\n-o, --output.file <output>  Output (if absent, prints to stdout)\n-f, --output.format [es]    Type of output (amd, cjs, es, iife, umd)\n-e, --external              Comma-separate list of module IDs to exclude\n-g, --globals               Comma-separate list of `module ID:Global` pairs\n                              Any module IDs defined here are added to external\n-n, --name                  Name for UMD export\n-m, --sourcemap             Generate sourcemap (`-m inline` for inline map)\n-l, --legacy                Support IE8\n--amd.id                    ID for AMD module (default is anonymous)\n--amd.define                Function to use in place of `define`\n--no-strict                 Don't emit a `\"use strict\";` in the generated modules.\n--no-indent                 Don't indent result\n--environment <values>      Settings passed to config file (see example)\n--no-conflict               Generate a noConflict method for UMD globals\n--no-treeshake              Disable tree-shaking\n--silent                    Don't print warnings\n--intro                     Content to insert at top of bundle (inside wrapper)\n--outro                     Content to insert at end of bundle (inside wrapper)\n--banner                    Content to insert at top of bundle (outside wrapper)\n--footer                    Content to insert at end of bundle (outside wrapper)\n--interop                   Include interop block (true by default)\n\nExamples:\n\n# use settings in config file\nrollup -c\n\n# in config file, process.env.INCLUDE_DEPS === 'true'\n# and process.env.BUILD === 'production'\nrollup -c --environment INCLUDE_DEPS,BUILD:production\n\n# create CommonJS bundle.js from src/main.js\nrollup --format=cjs --output=bundle.js -- src/main.js\n\n# create self-executing IIFE using `window.jQuery`\n# and `window._` as external globals\nrollup -f iife --globals jquery:jQuery,lodash:_ \\\n  -i src/app.js -o build/app.js -m build/app.js.map\n\nNotes:\n\n* When piping to stdout, only inline sourcemaps are permitted\n\nFor more information visit https://rollupjs.org\n";
 
-var version = "0.55.1";
+var version = "0.55.5";
 
 var modules = {};
 
@@ -2346,7 +2346,8 @@ function mergeOptions(_a) {
         cache: getInputOption('cache'),
         preferConst: getInputOption('preferConst'),
         experimentalDynamicImport: getInputOption('experimentalDynamicImport'),
-        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting')
+        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting'),
+        preserveSymlinks: getInputOption('preserveSymlinks')
     };
     // legacy, to ensure e.g. commonjs plugin still works
     inputOptions.entry = inputOptions.input;
@@ -3730,6 +3731,10 @@ x.iTerm.setCwd = cwd => '\u001B]50;CurrentDir=' + (cwd || process.cwd()) + '\u00
 
 var SHOW_ALTERNATE_SCREEN = '\u001B[?1049h';
 var HIDE_ALTERNATE_SCREEN = '\u001B[?1049l';
+var isWindows = process.platform === 'win32';
+var isMintty = isWindows && !!(process.env.SHELL || process.env.TERM);
+var isConEmuAnsiOn = (process.env.ConEmuANSI || '').toLowerCase() === 'on';
+var supportsAnsi = !isWindows || isMintty || isConEmuAnsiOn;
 function alternateScreen(enabled) {
     if (!enabled) {
         var needAnnounce_1 = true;
@@ -3746,10 +3751,14 @@ function alternateScreen(enabled) {
     }
     return {
         open: function () {
-            process.stderr.write(SHOW_ALTERNATE_SCREEN);
+            if (supportsAnsi) {
+                process.stderr.write(SHOW_ALTERNATE_SCREEN);
+            }
         },
         close: function () {
-            process.stderr.write(HIDE_ALTERNATE_SCREEN);
+            if (supportsAnsi) {
+                process.stderr.write(HIDE_ALTERNATE_SCREEN);
+            }
         },
         reset: function (heading) {
             stderr("" + ansiEscapes.eraseScreen + ansiEscapes.cursorTo(0, 0) + heading);

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.55.1
-	Fri Jan 26 2018 08:02:56 GMT+0100 (CET) - commit a45e870d2d0f3bf4c8c6dbc3bfa0d8660a2c34c3
+	Rollup.js v0.55.5
+	Sat Feb 10 2018 08:50:44 GMT+0100 (CET) - commit 82fe34dfe39d6c2aea9ca32444ea4a68e3afe814
 
 
 	https://github.com/rollup/rollup
@@ -382,7 +382,8 @@ function mergeOptions(_a) {
         cache: getInputOption('cache'),
         preferConst: getInputOption('preferConst'),
         experimentalDynamicImport: getInputOption('experimentalDynamicImport'),
-        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting')
+        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting'),
+        preserveSymlinks: getInputOption('preserveSymlinks')
     };
     // legacy, to ensure e.g. commonjs plugin still works
     inputOptions.entry = inputOptions.input;
@@ -17431,12 +17432,12 @@ var ExternalModule = /** @class */ (function () {
 function load(id) {
     return readFileSync(id, 'utf-8');
 }
-function findFile(file) {
+function findFile(file, preserveSymlinks) {
     try {
         var stats = lstatSync(file);
-        if (stats.isSymbolicLink())
-            return findFile(realpathSync(file));
-        if (stats.isFile()) {
+        if (!preserveSymlinks && stats.isSymbolicLink())
+            return findFile(realpathSync(file), preserveSymlinks);
+        if ((preserveSymlinks && stats.isSymbolicLink()) || stats.isFile()) {
             // check case
             var name = basename(file);
             var files = readdirSync(dirname(file));
@@ -17448,26 +17449,28 @@ function findFile(file) {
         // suppress
     }
 }
-function addJsExtensionIfNecessary(file) {
-    return findFile(file) || findFile(file + '.js');
+function addJsExtensionIfNecessary(file, preserveSymlinks) {
+    return findFile(file, preserveSymlinks) || findFile(file + '.js', preserveSymlinks);
 }
-function resolveId(importee, importer) {
-    if (typeof process === 'undefined') {
-        error({
-            code: 'MISSING_PROCESS',
-            message: "It looks like you're using Rollup in a non-Node.js environment. This means you must supply a plugin with custom resolveId and load functions",
-            url: 'https://github.com/rollup/rollup/wiki/Plugins'
-        });
-    }
-    // external modules (non-entry modules that start with neither '.' or '/')
-    // are skipped at this stage.
-    if (importer !== undefined && !isAbsolute(importee) && importee[0] !== '.')
-        return null;
-    // `resolve` processes paths from right to left, prepending them until an
-    // absolute path is created. Absolute importees therefore shortcircuit the
-    // resolve call and require no special handing on our part.
-    // See https://nodejs.org/api/path.html#path_path_resolve_paths
-    return addJsExtensionIfNecessary(resolve(importer ? dirname(importer) : resolve(), importee));
+function resolveId(options) {
+    return function (importee, importer) {
+        if (typeof process === 'undefined') {
+            error({
+                code: 'MISSING_PROCESS',
+                message: "It looks like you're using Rollup in a non-Node.js environment. This means you must supply a plugin with custom resolveId and load functions",
+                url: 'https://github.com/rollup/rollup/wiki/Plugins'
+            });
+        }
+        // external modules (non-entry modules that start with neither '.' or '/')
+        // are skipped at this stage.
+        if (importer !== undefined && !isAbsolute(importee) && importee[0] !== '.')
+            return null;
+        // `resolve` processes paths from right to left, prepending them until an
+        // absolute path is created. Absolute importees therefore shortcircuit the
+        // resolve call and require no special handing on our part.
+        // See https://nodejs.org/api/path.html#path_path_resolve_paths
+        return addJsExtensionIfNecessary(resolve(importer ? dirname(importer) : resolve(), importee), options.preserveSymlinks);
+    };
 }
 function makeOnwarn() {
     var warned = blank();
@@ -17718,23 +17721,38 @@ function getExportBlock(exports, dependencies, exportMode, mechanism) {
         return mechanism + " " + local_1 + ";";
     }
     var exportBlock = '';
+    // star exports must always output first for precedence
     dependencies.forEach(function (_a) {
         var name = _a.name, reexports = _a.reexports;
         if (reexports && exportMode !== 'default') {
             reexports.forEach(function (specifier) {
-                if (specifier.imported === '*') {
+                if (specifier.reexported === '*') {
                     exportBlock += (exportBlock ? '\n' : '') + "Object.keys(" + name + ").forEach(function (key) { exports[key] = " + name + "[key]; });";
                 }
             });
         }
     });
     dependencies.forEach(function (_a) {
-        var name = _a.name, reexports = _a.reexports;
+        var name = _a.name, imports = _a.imports, reexports = _a.reexports;
         if (reexports && exportMode !== 'default') {
             reexports.forEach(function (specifier) {
-                if (specifier.imported !== '*') {
+                if (specifier.imported === 'default') {
+                    var exportsNamesOrNamespace = imports &&
+                        imports.some(function (specifier) { return specifier.imported === '*' || specifier.imported !== 'default'; }) ||
+                        reexports && reexports.some(function (specifier) { return specifier.imported !== 'default' && specifier.imported !== '*'; });
+                    if (exportsNamesOrNamespace) {
+                        exportBlock += (exportBlock ? '\n' : '') + "exports." + specifier.reexported + " = " + name + "__default;";
+                    }
+                    else {
+                        exportBlock += (exportBlock ? '\n' : '') + "exports." + specifier.reexported + " = " + name + ";";
+                    }
+                }
+                else if (specifier.imported !== '*') {
                     exportBlock += (exportBlock ? '\n' : '') + "exports." + specifier.reexported + " = " + name + "." + specifier.imported + ";";
                 }
+                else if (specifier.reexported !== '*') {
+                    exportBlock += (exportBlock ? '\n' : '') + "exports." + specifier.reexported + " = " + name + ";";
+                }
             });
         }
     });
@@ -17863,7 +17881,7 @@ function cjs(chunk, magicString, _a, options) {
         }
         needsInterop = true;
         var exportsNames = imports && imports.some(function (specifier) { return specifier.imported !== 'default' && specifier.imported !== '*'; }) ||
-            reexports && reexports.some(function (specifier) { return specifier.imported === 'default'; });
+            reexports && reexports.some(function (specifier) { return specifier.imported !== 'default' && specifier.imported !== '*'; });
         if (exportsNames) {
             return varOrConst + " " + name + " = require('" + getPath(id) + "');" +
                 ("\n" + varOrConst + " " + name + "__default = _interopDefault(" + name + ");");
@@ -17889,23 +17907,25 @@ function es(chunk, magicString, _a) {
     var getPath = _a.getPath, intro = _a.intro, outro = _a.outro;
     var _b = chunk.getModuleDeclarations(), dependencies = _b.dependencies, exports = _b.exports;
     var importBlock = dependencies.map(function (_a) {
-        var id = _a.id, reexports = _a.reexports, imports = _a.imports;
+        var id = _a.id, reexports = _a.reexports, imports = _a.imports, name = _a.name;
         if (!reexports && !imports) {
             return "import '" + getPath(id) + "';";
         }
         var output = '';
         if (imports) {
             var defaultImport_1 = imports.find(function (specifier) { return specifier.imported === 'default'; });
-            var starImport = imports.find(function (specifier) { return specifier.imported === '*'; });
-            if (starImport) {
-                output += "import * as " + starImport.local + " from '" + getPath(id) + "';";
+            var starImport_1 = imports.find(function (specifier) { return specifier.imported === '*'; });
+            if (starImport_1) {
+                output += "import * as " + starImport_1.local + " from '" + getPath(id) + "';";
+                if (imports.length > 1)
+                    output += '\n';
             }
-            else if (defaultImport_1 && imports.length === 1) {
+            if (defaultImport_1 && imports.length === 1) {
                 output += "import " + defaultImport_1.local + " from '" + getPath(id) + "';";
             }
-            else {
+            else if (!starImport_1 || imports.length > 1) {
                 output += "import " + (defaultImport_1 ? defaultImport_1.local + ", " : '') + "{ " + imports
-                    .filter(function (specifier) { return specifier !== defaultImport_1; })
+                    .filter(function (specifier) { return specifier !== defaultImport_1 && specifier !== starImport_1; })
                     .map(function (specifier) {
                     if (specifier.imported === specifier.local) {
                         return specifier.imported;
@@ -17918,16 +17938,27 @@ function es(chunk, magicString, _a) {
             }
         }
         if (reexports) {
+            if (imports)
+                output += '\n';
             var starExport_1 = reexports.find(function (specifier) { return specifier.reexported === '*'; });
+            var namespaceReexport_1 = reexports.find(function (specifier) { return specifier.imported === '*' && specifier.reexported !== '*'; });
             if (starExport_1) {
-                output += "export * from '" + id + "';";
+                output += "export * from '" + getPath(id) + "';";
                 if (reexports.length === 1) {
                     return output;
                 }
                 output += '\n';
             }
+            if (namespaceReexport_1) {
+                output += "import * as " + name + " from '" + getPath(id) + "';\n";
+                output += "export { " + (name === namespaceReexport_1.reexported ? name : name + " as " + namespaceReexport_1.reexported) + " };";
+                if (reexports.length === (starExport_1 ? 2 : 1)) {
+                    return output;
+                }
+                output += '\n';
+            }
             output += "export { " + reexports
-                .filter(function (specifier) { return specifier !== starExport_1; })
+                .filter(function (specifier) { return specifier !== starExport_1 && specifier !== namespaceReexport_1; })
                 .map(function (specifier) {
                 if (specifier.imported === specifier.reexported) {
                     return specifier.imported;
@@ -18552,21 +18583,7 @@ var Chunk$1 = /** @class */ (function () {
         this.orderedModules.forEach(function (module) {
             Object.keys(module.imports).forEach(function (importName) {
                 var declaration = module.imports[importName];
-                var tracedExport = _this.traceExport(declaration.module, declaration.name);
-                // ignore imports to modules already in this chunk
-                if (!tracedExport || tracedExport.module.chunk === _this) {
-                    return;
-                }
-                var variable = tracedExport.module.traceExport(tracedExport.name);
-                // namespace variable can indicate multiple imports
-                if (tracedExport.name === '*') {
-                    Object.keys(variable.originals || variable.module.declarations).forEach(function (importName) {
-                        var original = (variable.originals || variable.module.declarations)[importName];
-                        _this.populateImport(original, tracedExport);
-                    });
-                    return;
-                }
-                _this.populateImport(variable, tracedExport);
+                _this.traceImport(declaration.module, declaration.name);
             });
         });
     };
@@ -18607,6 +18624,25 @@ var Chunk$1 = /** @class */ (function () {
     Chunk.prototype.getJsonModules = function () {
         return this.orderedModules.map(function (module) { return module.toJSON(); });
     };
+    Chunk.prototype.traceImport = function (module, exportName) {
+        var _this = this;
+        var tracedExport = this.traceExport(module, exportName);
+        // ignore imports to modules already in this chunk
+        if (!tracedExport || tracedExport.module.chunk === this) {
+            return tracedExport;
+        }
+        var variable = tracedExport.module.traceExport(tracedExport.name);
+        // namespace variable can indicate multiple imports
+        if (tracedExport.name === '*') {
+            Object.keys(variable.originals || variable.module.declarations).forEach(function (importName) {
+                var original = (variable.originals || variable.module.declarations)[importName];
+                _this.populateImport(original, tracedExport);
+            });
+            return tracedExport;
+        }
+        this.populateImport(variable, tracedExport);
+        return tracedExport;
+    };
     // trace a module export to its exposed chunk module export
     // either in this chunk or in another
     // we follow reexports if they are not entry points in the hope
@@ -18622,7 +18658,12 @@ var Chunk$1 = /** @class */ (function () {
         if (module.chunk !== this && module.isEntryPoint) {
             return { name: name, module: module };
         }
-        if (module.exports[name]) {
+        var exportDeclaration = module.exports[name];
+        if (exportDeclaration) {
+            // if export binding is itself an import binding then continue tracing
+            var importDeclaration = module.imports[exportDeclaration.localName];
+            if (importDeclaration)
+                return this.traceImport(importDeclaration.module, importDeclaration.name);
             return { name: name, module: module };
         }
         var reexportDeclaration = module.reexports[name];
@@ -18748,13 +18789,13 @@ var Chunk$1 = /** @class */ (function () {
             used['_setter'] = used['_starExcludes'] = used['_$p'] = 1;
         }
         var toDeshadow = new Set();
-        this.externalModules.forEach(function (module) {
-            if (!es || module.exportsNamespace) {
+        if (!es) {
+            this.externalModules.forEach(function (module) {
                 var safeName = getSafeName(module.name);
                 toDeshadow.add(safeName);
                 module.name = safeName;
-            }
-        });
+            });
+        }
         this.imports.forEach(function (impt) {
             impt.variables.forEach(function (_a) {
                 var name = _a.name, module = _a.module, variable = _a.variable;
@@ -18772,9 +18813,10 @@ var Chunk$1 = /** @class */ (function () {
                         }
                     }
                     else {
-                        safeName = (es || system) ? getSafeName(variable.name) : module.name + "." + name;
+                        safeName = (es || system) ? variable.name : module.name + "." + name;
                     }
                     if (es || system) {
+                        safeName = getSafeName(safeName);
                         toDeshadow.add(safeName);
                     }
                 }
@@ -19058,7 +19100,6 @@ function firstSync(candidates) {
     };
 }
 
-/// <reference path="./Graph.d.ts" />
 function generateChunkName(id, chunkNames, startAtTwo) {
     if (startAtTwo === void 0) { startAtTwo = false; }
     var name = basename(id);
@@ -19123,7 +19164,7 @@ var Graph = /** @class */ (function () {
         }
         this.resolveId = first([(function (id, parentId) { return (_this.isExternal(id, parentId, false) ? false : null); })]
             .concat(this.plugins.map(function (plugin) { return plugin.resolveId; }).filter(Boolean))
-            .concat(resolveId));
+            .concat(resolveId(options)));
         var loaders = this.plugins.map(function (plugin) { return plugin.load; }).filter(Boolean);
         this.hasLoaders = loaders.length !== 0;
         this.load = first(loaders.concat(load));
@@ -19236,10 +19277,7 @@ var Graph = /** @class */ (function () {
             // determine the topological execution order for the bundle
             timeStart('phase 2');
             _this.link();
-            var _a = _this.analyseExecution([entryModule]), orderedModules = _a.orderedModules, dynamicImports = _a.dynamicImports, hasCycles = _a.hasCycles;
-            if (hasCycles) {
-                _this.warnCycle(entryModule, orderedModules);
-            }
+            var _a = _this.analyseExecution([entryModule]), orderedModules = _a.orderedModules, dynamicImports = _a.dynamicImports;
             timeEnd('phase 2');
             // Phase 3 – marking. We include all statements that should be included
             timeStart('phase 3');
@@ -19369,17 +19407,12 @@ var Graph = /** @class */ (function () {
     };
     Graph.prototype.analyseExecution = function (entryModules) {
         var _this = this;
-        var hasCycles = false, curEntry, curEntryHash;
+        var curEntry, curEntryHash;
         var allSeen = {};
         var ordered = [];
         var dynamicImports = [];
-        var visit = function (module, seen) {
-            if (seen === void 0) { seen = {}; }
-            if (seen[module.id]) {
-                hasCycles = true;
-                return;
-            }
-            seen[module.id] = true;
+        var visit = function (module, parents) {
+            if (parents === void 0) { parents = (_a = {}, _a[module.id] = null, _a); }
             if (module.isEntryPoint && module !== curEntry)
                 return;
             // Track entry point graph colouring by tracing all modules loaded by a given
@@ -19389,7 +19422,14 @@ var Graph = /** @class */ (function () {
             Uint8ArrayXor(module.entryPointsHash, curEntryHash);
             module.dependencies.forEach(function (depModule) {
                 if (!depModule.isExternal) {
-                    visit(depModule, seen);
+                    if (depModule.id in parents) {
+                        if (!allSeen[depModule.id]) {
+                            _this.warnCycle(depModule.id, module.id, parents);
+                        }
+                        return;
+                    }
+                    parents[depModule.id] = module.id;
+                    visit(depModule, parents);
                 }
             });
             if (_this.dynamicImport) {
@@ -19406,6 +19446,7 @@ var Graph = /** @class */ (function () {
             allSeen[module.id] = true;
             module.execIndex = ordered.length;
             ordered.push(module);
+            var _a;
         };
         for (var i = 0; i < entryModules.length; i++) {
             curEntry = entryModules[i];
@@ -19420,10 +19461,24 @@ var Graph = /** @class */ (function () {
             curEntryHash = randomUint8Array(10);
             visit(curEntry);
         }
-        return { orderedModules: ordered, dynamicImports: dynamicImports, hasCycles: hasCycles };
+        return { orderedModules: ordered, dynamicImports: dynamicImports };
     };
-    Graph.prototype.warnCycle = function (_entryModule, _ordered) {
-        // TODO: reinstate
+    Graph.prototype.warnCycle = function (id, parentId, parents) {
+        var path = [relativeId(id)];
+        var curId = parentId;
+        while (curId !== id) {
+            path.push(relativeId(curId));
+            curId = parents[curId];
+            if (!curId)
+                break;
+        }
+        path.push(path[0]);
+        path.reverse();
+        this.warn({
+            code: 'CIRCULAR_DEPENDENCY',
+            importer: path[0],
+            message: "Circular dependency: " + path.join(' -> ')
+        });
     };
     Graph.prototype.fetchModule = function (id, importer) {
         var _this = this;
@@ -19868,7 +19923,7 @@ function getAndCheckOutputOptions(inputOptions, rawOutputOptions) {
     return outputOptions;
 }
 
-var version$1 = "0.55.1";
+var version$1 = "0.55.5";
 
 exports.rollup = rollup;
 exports.VERSION = version$1;