rollup 0.57.0 → 0.57.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # rollup changelog
 
+## 0.57.1
+* Improve sourcemap generation performance ([#2062](https://github.com/rollup/rollup/pull/2062))
+* Add reserved config option namespace and improve CLI interface ([#2063](https://github.com/rollup/rollup/pull/2063))
+* Fix issue with default exported function and class expressions ([#2059](https://github.com/rollup/rollup/pull/2059))
+* Replace `forEach` with faster `for` loops in some places ([#2064](https://github.com/rollup/rollup/pull/2064))
+
 ## 0.57.0
 * Add option to preserve the module structure instead of bundling ([#1922](https://github.com/rollup/rollup/pull/1922))
 * Enable watch mode when code-splitting ([#2035](https://github.com/rollup/rollup/pull/2035))

package/bin/rollup

@@ -249,9 +249,9 @@ function isNumber (x) {
     return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(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 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, --file <output>         Output (if absent, prints to stdout)\n-f, --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--no-interop                Do not include interop block\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 --file=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.57.0";
+var version = "0.57.1";
 
 var modules = {};
 
@@ -2328,7 +2328,12 @@ function deprecateOptions(options, deprecateConfig) {
     }
 }
 
-function normalizeObjectOptionValue(optionValue) {
+var createGetOption = function (config, command) { return function (name, defaultValue) {
+    return command[name] !== undefined
+        ? command[name]
+        : config[name] !== undefined ? config[name] : defaultValue;
+}; };
+var normalizeObjectOptionValue = function (optionValue) {
     if (!optionValue) {
         return optionValue;
     }
@@ -2336,7 +2341,17 @@ function normalizeObjectOptionValue(optionValue) {
         return {};
     }
     return optionValue;
-}
+};
+var getObjectOption = function (config, command, name) {
+    var commandOption = normalizeObjectOptionValue(command[name]);
+    var configOption = normalizeObjectOptionValue(config[name]);
+    if (commandOption !== undefined) {
+        return commandOption && configOption
+            ? Object.assign({}, configOption, commandOption)
+            : commandOption;
+    }
+    return configOption;
+};
 var defaultOnWarn = function (warning) {
     if (typeof warning === 'string') {
         console.warn(warning); // eslint-disable-line no-console
@@ -2345,148 +2360,147 @@ var defaultOnWarn = function (warning) {
         console.warn(warning.message); // eslint-disable-line no-console
     }
 };
-function mergeOptions(_a) {
-    var config = _a.config, _b = _a.command, command = _b === void 0 ? {} : _b, deprecateConfig = _a.deprecateConfig, _c = _a.defaultOnWarnHandler, defaultOnWarnHandler = _c === void 0 ? defaultOnWarn : _c;
-    var deprecations = deprecate(config, command, deprecateConfig);
-    var getOption = function (config) { return function (name) {
-        return command[name] !== undefined ? command[name] : config[name];
-    }; };
-    var getInputOption = getOption(config);
-    var getOutputOption = getOption(config.output || {});
-    function getObjectOption(name) {
-        var commandOption = normalizeObjectOptionValue(command[name]);
-        var configOption = normalizeObjectOptionValue(config[name]);
-        if (commandOption !== undefined) {
-            return commandOption && configOption
-                ? Object.assign({}, configOption, commandOption)
-                : commandOption;
+var getOnWarn = function (config, command, defaultOnWarnHandler) {
+    if (defaultOnWarnHandler === void 0) { defaultOnWarnHandler = defaultOnWarn; }
+    return command.silent
+        ? function () { }
+        : config.onwarn
+            ? function (warning) { return config.onwarn(warning, defaultOnWarnHandler); }
+            : defaultOnWarnHandler;
+};
+var getExternal = function (config, command) {
+    var configExternal = config.external;
+    return typeof configExternal === 'function'
+        ? function (id) {
+            var rest = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                rest[_i - 1] = arguments[_i];
+            }
+            return configExternal.apply(void 0, [id].concat(rest)) || command.external.indexOf(id) !== -1;
         }
-        return configOption;
-    }
-    var onwarn = config.onwarn;
-    var warn;
-    if (onwarn) {
-        warn = function (warning) { return onwarn(warning, defaultOnWarnHandler); };
+        : (configExternal || []).concat(command.external);
+};
+var commandAliases = {
+    c: 'config',
+    d: 'indent',
+    e: 'external',
+    f: 'format',
+    g: 'globals',
+    h: 'help',
+    i: 'input',
+    l: 'legacy',
+    m: 'sourcemap',
+    n: 'name',
+    o: 'file',
+    v: 'version',
+    w: 'watch'
+};
+function mergeOptions(_a) {
+    var _b = _a.config, config = _b === void 0 ? {} : _b, _c = _a.command, rawCommandOptions = _c === void 0 ? {} : _c, deprecateConfig = _a.deprecateConfig, defaultOnWarnHandler = _a.defaultOnWarnHandler;
+    var deprecations = deprecate(config, rawCommandOptions, deprecateConfig);
+    var command = getCommandOptions(rawCommandOptions);
+    var inputOptions = getInputOptions(config, command, defaultOnWarnHandler);
+    if (command.output) {
+        Object.assign(command, command.output);
     }
-    else {
-        warn = defaultOnWarnHandler;
+    var normalizedOutputOptions = ensureArray(config.output);
+    if (normalizedOutputOptions.length === 0)
+        normalizedOutputOptions.push({});
+    var outputOptions = normalizedOutputOptions.map(function (singleOutputOptions) {
+        return getOutputOptions(singleOutputOptions, command);
+    });
+    var unknownOptionErrors = [];
+    var validInputOptions = Object.keys(inputOptions);
+    addUnknownOptionErrors(unknownOptionErrors, Object.keys(config), validInputOptions, 'input option', /^output$/);
+    var validOutputOptions = Object.keys(outputOptions[0]);
+    addUnknownOptionErrors(unknownOptionErrors, outputOptions.reduce(function (allKeys, options) { return allKeys.concat(Object.keys(options)); }, []), validOutputOptions, 'output option');
+    addUnknownOptionErrors(unknownOptionErrors, Object.keys(command), validInputOptions.concat(validOutputOptions, Object.keys(commandAliases), 'config', 'environment', 'silent'), 'CLI flag', /^_|output|(config.*)$/);
+    return {
+        inputOptions: inputOptions,
+        outputOptions: outputOptions,
+        deprecations: deprecations,
+        optionError: unknownOptionErrors.length > 0 ? unknownOptionErrors.join('\n') : null
+    };
+}
+function addUnknownOptionErrors(errors, options, validOptions, optionType, ignoredKeys) {
+    if (ignoredKeys === void 0) { ignoredKeys = /$./; }
+    var unknownOptions = options.filter(function (key) { return validOptions.indexOf(key) === -1 && !ignoredKeys.test(key); });
+    if (unknownOptions.length > 0)
+        errors.push("Unknown " + optionType + ": " + unknownOptions.join(', ') + ". Allowed options: " + validOptions.sort().join(', '));
+}
+function getCommandOptions(rawCommandOptions) {
+    var command = Object.assign({}, rawCommandOptions);
+    command.external = (rawCommandOptions.external || '').split(',');
+    if (rawCommandOptions.globals) {
+        command.globals = Object.create(null);
+        rawCommandOptions.globals.split(',').forEach(function (str) {
+            var 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;
+}
+function getInputOptions(config, command, defaultOnWarnHandler) {
+    if (command === void 0) { command = {}; }
+    var getOption = createGetOption(config, command);
     var inputOptions = {
         acorn: config.acorn,
         acornInjectPlugins: config.acornInjectPlugins,
-        cache: getInputOption('cache'),
+        cache: getOption('cache'),
         context: config.context,
-        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting'),
-        experimentalDynamicImport: getInputOption('experimentalDynamicImport'),
-        experimentalPreserveModules: getInputOption('experimentalPreserveModules'),
-        input: getInputOption('input'),
-        legacy: getInputOption('legacy'),
+        experimentalCodeSplitting: getOption('experimentalCodeSplitting'),
+        experimentalDynamicImport: getOption('experimentalDynamicImport'),
+        experimentalPreserveModules: getOption('experimentalPreserveModules'),
+        external: getExternal(config, command),
+        input: getOption('input'),
         moduleContext: config.moduleContext,
-        onwarn: warn,
-        perf: getInputOption('perf'),
+        onwarn: getOnWarn(config, command, defaultOnWarnHandler),
+        perf: getOption('perf', false),
         plugins: config.plugins,
-        preferConst: getInputOption('preferConst'),
-        preserveSymlinks: getInputOption('preserveSymlinks'),
-        treeshake: getObjectOption('treeshake'),
+        preferConst: getOption('preferConst'),
+        preserveSymlinks: getOption('preserveSymlinks'),
+        treeshake: getObjectOption(config, command, 'treeshake'),
         watch: config.watch
     };
-    // legacy, to ensure e.g. commonjs plugin still works
-    inputOptions.entry = inputOptions.input;
-    var commandExternal = (command.external || '').split(',');
-    var configExternal = config.external;
-    if (command.globals) {
-        var globals_1 = Object.create(null);
-        command.globals.split(',').forEach(function (str) {
-            var names = str.split(':');
-            globals_1[names[0]] = names[1];
-            // Add missing Module IDs to external.
-            if (commandExternal.indexOf(names[0]) === -1) {
-                commandExternal.push(names[0]);
-            }
-        });
-        command.globals = globals_1;
-    }
-    if (typeof configExternal === 'function') {
-        inputOptions.external = function (id) {
-            var rest = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                rest[_i - 1] = arguments[_i];
-            }
-            return configExternal.apply(void 0, [id].concat(rest)) || commandExternal.indexOf(id) !== -1;
-        };
-    }
-    else {
-        inputOptions.external = (configExternal || []).concat(commandExternal);
-    }
-    if (command.silent) {
-        inputOptions.onwarn = function () { };
-    }
-    // Make sure the CLI treats this the same way as when we are code-splitting
     if (inputOptions.experimentalPreserveModules && !Array.isArray(inputOptions.input)) {
         inputOptions.input = [inputOptions.input];
     }
-    var baseOutputOptions = {
-        amd: Object.assign({}, config.amd, command.amd),
-        banner: getOutputOption('banner'),
-        dir: getOutputOption('dir'),
-        exports: getOutputOption('exports'),
-        extend: getOutputOption('extend'),
-        file: getOutputOption('file'),
-        footer: getOutputOption('footer'),
-        format: getOutputOption('format'),
-        freeze: getOutputOption('freeze'),
-        globals: getOutputOption('globals'),
-        indent: getOutputOption('indent'),
-        interop: getOutputOption('interop'),
-        intro: getOutputOption('intro'),
-        legacy: getOutputOption('legacy'),
-        name: getOutputOption('name'),
-        namespaceToStringTag: getOutputOption('namespaceToStringTag'),
-        noConflict: getOutputOption('noConflict'),
-        outro: getOutputOption('outro'),
-        paths: getOutputOption('paths'),
-        sourcemap: getOutputOption('sourcemap'),
-        sourcemapFile: getOutputOption('sourcemapFile'),
-        strict: getOutputOption('strict')
-    };
-    var mergedOutputOptions;
-    if (Array.isArray(config.output)) {
-        mergedOutputOptions = config.output.map(function (output) {
-            return Object.assign({}, output, command.output);
-        });
-    }
-    else if (config.output && command.output) {
-        mergedOutputOptions = [Object.assign({}, config.output, command.output)];
-    }
-    else {
-        mergedOutputOptions =
-            command.output || config.output
-                ? ensureArray(command.output || config.output)
-                : [
-                    {
-                        file: command.output ? command.output.file : null,
-                        format: command.output ? command.output.format : null
-                    }
-                ];
-    }
-    var outputOptions = mergedOutputOptions.map(function (output) {
-        return Object.assign({}, baseOutputOptions, output);
-    });
-    // check for errors
-    var validKeys = Object.keys(inputOptions).concat(Object.keys(baseOutputOptions), [
-        'pureExternalModules' // (backward compatibility) till everyone moves to treeshake.pureExternalModules
-    ]);
-    var outputOptionKeys = Array.isArray(config.output)
-        ? config.output.reduce(function (keys, o) { return keys.concat(Object.keys(o)); }, [])
-        : Object.keys(config.output || {});
-    var errors = Object.keys(config || {}).concat(outputOptionKeys).filter(function (k) { return k !== 'output' && validKeys.indexOf(k) === -1; });
+    // legacy to make sure certain plugins still work
+    inputOptions.entry = Array.isArray(inputOptions.input)
+        ? inputOptions.input[0]
+        : inputOptions.input;
+    return inputOptions;
+}
+function getOutputOptions(config, command) {
+    if (command === void 0) { command = {}; }
+    var getOption = createGetOption(config, command);
     return {
-        inputOptions: inputOptions,
-        outputOptions: outputOptions,
-        deprecations: deprecations,
-        optionError: errors.length
-            ? "Unknown option found: " + errors.join(', ') + ". Allowed keys: " + validKeys.join(', ')
-            : null
+        amd: Object.assign({}, config.amd, command.amd),
+        banner: getOption('banner'),
+        dir: getOption('dir'),
+        exports: getOption('exports'),
+        extend: getOption('extend'),
+        file: getOption('file'),
+        footer: getOption('footer'),
+        format: getOption('format'),
+        freeze: getOption('freeze'),
+        globals: getOption('globals'),
+        indent: getOption('indent', true),
+        interop: getOption('interop', true),
+        intro: getOption('intro'),
+        legacy: getOption('legacy', false),
+        name: getOption('name'),
+        namespaceToStringTag: getOption('namespaceToStringTag'),
+        noConflict: getOption('noConflict'),
+        outro: getOption('outro'),
+        paths: getOption('paths'),
+        sourcemap: getOption('sourcemap'),
+        sourcemapFile: getOption('sourcemapFile'),
+        strict: getOption('strict', true)
     };
 }
 function deprecate(config, command, deprecateConfig) {
@@ -2504,17 +2518,10 @@ function deprecate(config, command, deprecateConfig) {
     if (typeof command.output === 'string') {
         deprecations.push({
             old: '--output',
-            new: '--output.file'
+            new: '--file'
         });
         command.output = { file: command.output };
     }
-    if (command.format) {
-        deprecations.push({
-            old: '--format',
-            new: '--output.format'
-        });
-        (command.output || (command.output = {})).format = command.format;
-    }
     // config file
     deprecations.push.apply(deprecations, deprecateOptions(config, deprecateConfig));
     return deprecations;
@@ -4059,25 +4066,7 @@ function execute(configFile, configs, command) {
 }
 
 var command = minimist(process.argv.slice(2), {
-    alias: {
-        // Aliases
-        strict: 'useStrict',
-        dir: 'output.dir',
-        // Short options
-        c: 'config',
-        d: 'indent',
-        e: 'external',
-        f: 'output.format',
-        g: 'globals',
-        h: 'help',
-        i: 'input',
-        l: 'legacy',
-        m: 'sourcemap',
-        n: 'name',
-        o: 'output.file',
-        v: 'version',
-        w: 'watch'
-    }
+    alias: commandAliases
 });
 if (command.help || (process.argv.length <= 2 && process.stdin.isTTY)) {
     console.log("\n" + help.replace('__VERSION__', version) + "\n"); // eslint-disable-line no-console