rollup 0.55.1 → 0.55.5

package/dist/rollup.es.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
@@ -9,7 +9,7 @@
 */
 import path, { basename, dirname, extname, relative, resolve, sep } from 'path';
 import { lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, watch, writeFile } from 'fs';
-import EventEmitter from 'events';
+import { EventEmitter } from 'events';
 import module$1 from 'module';
 
 function __extends(d, b) {
@@ -347,7 +347,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;
@@ -17396,12 +17397,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));
@@ -17413,26 +17414,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();
@@ -17683,23 +17686,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 + ";";
+                }
             });
         }
     });
@@ -17828,7 +17846,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 + ");");
@@ -17854,23 +17872,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;
@@ -17883,16 +17903,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;
@@ -18517,21 +18548,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);
             });
         });
     };
@@ -18572,6 +18589,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
@@ -18587,7 +18623,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];
@@ -18713,13 +18754,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;
@@ -18737,9 +18778,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);
                     }
                 }
@@ -19023,7 +19065,6 @@ function firstSync(candidates) {
     };
 }
 
-/// <reference path="./Graph.d.ts" />
 function generateChunkName(id, chunkNames, startAtTwo) {
     if (startAtTwo === void 0) { startAtTwo = false; }
     var name = basename(id);
@@ -19088,7 +19129,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));
@@ -19201,10 +19242,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');
@@ -19334,17 +19372,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
@@ -19354,7 +19387,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) {
@@ -19371,6 +19411,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];
@@ -19385,10 +19426,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$$1 = [relativeId(id)];
+        var curId = parentId;
+        while (curId !== id) {
+            path$$1.push(relativeId(curId));
+            curId = parents[curId];
+            if (!curId)
+                break;
+        }
+        path$$1.push(path$$1[0]);
+        path$$1.reverse();
+        this.warn({
+            code: 'CIRCULAR_DEPENDENCY',
+            importer: path$$1[0],
+            message: "Circular dependency: " + path$$1.join(' -> ')
+        });
     };
     Graph.prototype.fetchModule = function (id, importer) {
         var _this = this;
@@ -23601,7 +23656,7 @@ function watch$1(configs) {
     return new Watcher(configs);
 }
 
-var version$1 = "0.55.1";
+var version$1 = "0.55.5";
 
 /// <reference path="../typings/package.json.d.ts" />