rollup 1.12.2 → 1.12.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # rollup changelog
 
+## 1.12.3
+*2019-05-19*
+
+### Bug Fixes
+* Prevent duplicate imports when exports are reexported as default exports (#2866)
+
+### Pull Requests
+* [#2755](https://github.com/rollup/rollup/pull/2755): Enable TypeScript strictNullChecks (@edsrzf)
+* [#2866](https://github.com/rollup/rollup/pull/2866): Properly deduplicate reexported default exports (@lukastaegert)
+
 ## 1.12.2
 *2019-05-17*
 

package/bin/rollup

@@ -223,7 +223,7 @@ function isNumber(x) {
     return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
 }
 
-var version = "1.12.2";
+var version = "1.12.3";
 
 const createGetOption = (config, command) => (name, defaultValue) => command[name] !== undefined
     ? command[name]
@@ -264,7 +264,11 @@ const getExternal = (config, command) => {
     const configExternal = config.external;
     return typeof configExternal === 'function'
         ? (id, ...rest) => configExternal(id, ...rest) || command.external.indexOf(id) !== -1
-        : (configExternal || []).concat(command.external);
+        : (typeof config.external === 'string'
+            ? [configExternal]
+            : Array.isArray(configExternal)
+                ? configExternal
+                : []).concat(command.external);
 };
 const commandAliases = {
     c: 'config',
@@ -310,22 +314,21 @@ function addUnknownOptionErrors(errors, options, validOptions, optionType, ignor
         errors.push(`Unknown ${optionType}: ${unknownOptions.join(', ')}. Allowed options: ${validOptions.sort().join(', ')}`);
 }
 function getCommandOptions(rawCommandOptions) {
-    const command = Object.assign({}, rawCommandOptions);
-    command.external = rawCommandOptions.external ? rawCommandOptions.external.split(',') : [];
-    if (rawCommandOptions.globals) {
-        command.globals = Object.create(null);
-        rawCommandOptions.globals.split(',').forEach((str) => {
-            const names = str.split(':');
-            command.globals[names[0]] = names[1];
-            // Add missing Module IDs to external.
-            if (command.external.indexOf(names[0]) === -1) {
-                command.external.push(names[0]);
-            }
-        });
-    }
-    return command;
+    const external = rawCommandOptions.external && typeof rawCommandOptions.external === 'string'
+        ? rawCommandOptions.external.split(',')
+        : [];
+    return Object.assign({}, rawCommandOptions, { external, globals: typeof rawCommandOptions.globals === 'string'
+            ? rawCommandOptions.globals.split(',').reduce((globals, globalDefinition) => {
+                const [id, variableName] = globalDefinition.split(':');
+                globals[id] = variableName;
+                if (external.indexOf(id) === -1) {
+                    external.push(id);
+                }
+                return globals;
+            }, Object.create(null))
+            : undefined });
 }
-function getInputOptions(config, command = {}, defaultOnWarnHandler) {
+function getInputOptions(config, command = { external: [], globals: undefined }, defaultOnWarnHandler) {
     const getOption = createGetOption(config, command);
     const inputOptions = {
         acorn: config.acorn,
@@ -516,7 +519,7 @@ function handleError(err, recover = false) {
         stderr(turbocolor.cyan(err.url));
     }
     if (err.loc) {
-        stderr(`${relativeId(err.loc.file || err.id)} (${err.loc.line}:${err.loc.column})`);
+        stderr(`${relativeId((err.loc.file || err.id))} (${err.loc.line}:${err.loc.column})`);
     }
     else if (err.id) {
         stderr(relativeId(err.id));
@@ -563,7 +566,8 @@ function batchWarnings() {
                     return -1;
                 if (deferredHandlers[b])
                     return 1;
-                return allWarnings.get(b).length - allWarnings.get(a).length;
+                return (allWarnings.get(b).length -
+                    allWarnings.get(a).length);
             });
             codes.forEach(code => {
                 const handler = deferredHandlers[code];
@@ -939,9 +943,11 @@ function printTimings(timings) {
 function build(inputOptions, outputOptions, warnings, silent = false) {
     const useStdout = !outputOptions[0].file && !outputOptions[0].dir;
     const start = Date.now();
-    const files = useStdout ? ['stdout'] : outputOptions.map(t => relativeId(t.file || t.dir));
+    const files = useStdout
+        ? ['stdout']
+        : outputOptions.map(t => relativeId(t.file || t.dir));
     if (!silent) {
-        let inputFiles;
+        let inputFiles = undefined;
         if (typeof inputOptions.input === 'string') {
             inputFiles = inputOptions.input;
         }
@@ -974,7 +980,8 @@ function build(inputOptions, outputOptions, warnings, silent = false) {
                     else {
                         source = file.code;
                         if (output.sourcemap === 'inline') {
-                            source += `\n//# ${SOURCEMAPPING_URL$1}=${file.map.toUrl()}\n`;
+                            source += `\n//# ${SOURCEMAPPING_URL$1}=${file
+                                .map.toUrl()}\n`;
                         }
                     }
                     if (outputs.length > 1)