rollup 2.26.11 → 2.28.1

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.11
-	Tue, 08 Sep 2020 05:49:27 GMT - commit 022770a8058cb3598ea8b0c5df12384bcf7bc7ff
+	Rollup.js v2.28.1
+	Mon, 21 Sep 2020 06:38:23 GMT - commit 1040292e0b1ad6496d8cf0a3eee63b17d9a39a4f
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.11
-	Tue, 08 Sep 2020 05:49:27 GMT - commit 022770a8058cb3598ea8b0c5df12384bcf7bc7ff
+	Rollup.js v2.28.1
+	Mon, 21 Sep 2020 06:38:23 GMT - commit 1040292e0b1ad6496d8cf0a3eee63b17d9a39a4f
 
 
 	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.26.11";
+var version = "2.28.1";
 
 var charToInteger = {};
 var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -4651,9 +4651,8 @@ const HELPER_GENERATORS = {
     [INTEROP_NAMESPACE_VARIABLE]: (_, n, s, t, liveBindings, freeze, usedHelpers) => `function ${INTEROP_NAMESPACE_VARIABLE}(e)${_}{${n}` +
         (usedHelpers.has(INTEROP_NAMESPACE_DEFAULT_VARIABLE)
             ? `${t}return e${_}&&${_}e.__esModule${_}?${_}e${_}:${_}${INTEROP_NAMESPACE_DEFAULT_VARIABLE}(e)${s}${n}`
-            : `${t}if${_}(e${_}&&${_}e.__esModule)${_}{${_}return e${s}${_}}${_}else${_}{${n}` +
-                createNamespaceObject(_, n, t, t + t, liveBindings, freeze) +
-                `${t}}${n}`) +
+            : `${t}if${_}(e${_}&&${_}e.__esModule)${_}return e;${n}` +
+                createNamespaceObject(_, n, t, t, liveBindings, freeze)) +
         `}${n}${n}`,
     [INTEROP_NAMESPACE_DEFAULT_VARIABLE]: (_, n, _s, t, liveBindings, freeze) => `function ${INTEROP_NAMESPACE_DEFAULT_VARIABLE}(e)${_}{${n}` +
         createNamespaceObject(_, n, t, t, liveBindings, freeze) +
@@ -7302,7 +7301,7 @@ class IfStatement extends NodeBase {
                 hoistedDeclarations.push(...this.alternateScope.hoistedDeclarations);
             }
         }
-        renderHoistedDeclarations(hoistedDeclarations, this.start, code);
+        this.renderHoistedDeclarations(hoistedDeclarations, code);
     }
     getTestValue() {
         if (this.testValue === unset) {
@@ -7343,6 +7342,24 @@ class IfStatement extends NodeBase {
                 context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
         }
     }
+    renderHoistedDeclarations(hoistedDeclarations, code) {
+        const hoistedVars = [
+            ...new Set(hoistedDeclarations.map(identifier => {
+                const variable = identifier.variable;
+                return variable.included ? variable.getName() : '';
+            }))
+        ]
+            .filter(Boolean)
+            .join(', ');
+        if (hoistedVars) {
+            const parentType = this.parent.type;
+            const needsBraces = parentType !== Program && parentType !== BlockStatement;
+            code.prependRight(this.start, `${needsBraces ? '{ ' : ''}var ${hoistedVars}; `);
+            if (needsBraces) {
+                code.appendLeft(this.end, ` }`);
+            }
+        }
+    }
     shouldKeepAlternateBranch() {
         let currentParent = this.parent;
         do {
@@ -7357,14 +7374,6 @@ class IfStatement extends NodeBase {
         return false;
     }
 }
-function renderHoistedDeclarations(hoistedDeclarations, prependPosition, code) {
-    const hoistedVars = [
-        ...new Set(hoistedDeclarations.map(identifier => identifier.variable.getName()))
-    ].join(', ');
-    if (hoistedVars) {
-        code.prependRight(prependPosition, `var ${hoistedVars}; `);
-    }
-}
 
 class ImportDeclaration extends NodeBase {
     bind() { }
@@ -10988,12 +10997,21 @@ class Chunk$1 {
                     ? '[name].js'
                     : '[name][extname].js'
                 : options.entryFileNames;
-            path = relative(preserveModulesRelativeDir, `${dirname(sanitizedId)}/${renderNamePattern(pattern, 'output.entryFileNames', {
+            const currentDir = dirname(sanitizedId);
+            const fileName = renderNamePattern(pattern, 'output.entryFileNames', {
                 ext: () => extension.substr(1),
                 extname: () => extension,
                 format: () => options.format,
                 name: () => this.getChunkName()
-            }, this.getChunkInfo.bind(this))}`);
+            }, this.getChunkInfo.bind(this));
+            const currentPath = `${currentDir}/${fileName}`;
+            const { preserveModulesRoot } = options;
+            if (preserveModulesRoot && currentPath.startsWith(preserveModulesRoot)) {
+                path = currentPath.slice(preserveModulesRoot.length).replace(/^[\\/]/, '');
+            }
+            else {
+                path = relative(preserveModulesRelativeDir, currentPath);
+            }
         }
         else {
             path = `_virtual/${basename(sanitizedId)}`;
@@ -19381,7 +19399,7 @@ const getIdMatcher = (option) => {
                 ids.add(value);
             }
         }
-        return (id => ids.has(id) || matchers.some(matcher => matcher.test(id)));
+        return (id, ..._args) => ids.has(id) || matchers.some(matcher => matcher.test(id));
     }
     return () => false;
 };
@@ -19520,6 +19538,7 @@ function normalizeOutputOptions(config, inputOptions, unsetInputOptions) {
         plugins: ensureArray(config.plugins),
         preferConst: config.preferConst || false,
         preserveModules,
+        preserveModulesRoot: getPreserveModulesRoot(config),
         sourcemap: config.sourcemap || false,
         sourcemapExcludeSources: config.sourcemapExcludeSources || false,
         sourcemapFile: config.sourcemapFile,
@@ -19604,6 +19623,13 @@ const getPreserveModules$1 = (config, inlineDynamicImports, inputOptions) => {
     }
     return preserveModules;
 };
+const getPreserveModulesRoot = (config) => {
+    const preserveModulesRoot = config.preserveModulesRoot;
+    if (preserveModulesRoot === null || preserveModulesRoot === undefined) {
+        return undefined;
+    }
+    return resolve(preserveModulesRoot);
+};
 const getAmd = (config) => ({
     define: 'define',
     ...config.amd

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.11
-	Tue, 08 Sep 2020 05:49:27 GMT - commit 022770a8058cb3598ea8b0c5df12384bcf7bc7ff
+	Rollup.js v2.28.1
+	Mon, 21 Sep 2020 06:38:23 GMT - commit 1040292e0b1ad6496d8cf0a3eee63b17d9a39a4f
 
 
 	https://github.com/rollup/rollup
@@ -4090,6 +4090,7 @@ function mergeOutputOptions(config, overrides, warn) {
         plugins: ensureArray$1(config.plugins),
         preferConst: getOption('preferConst'),
         preserveModules: getOption('preserveModules'),
+        preserveModulesRoot: getOption('preserveModulesRoot'),
         sourcemap: getOption('sourcemap'),
         sourcemapExcludeSources: getOption('sourcemapExcludeSources'),
         sourcemapFile: getOption('sourcemapFile'),

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.11
-	Tue, 08 Sep 2020 05:49:27 GMT - commit 022770a8058cb3598ea8b0c5df12384bcf7bc7ff
+	Rollup.js v2.28.1
+	Mon, 21 Sep 2020 06:38:23 GMT - commit 1040292e0b1ad6496d8cf0a3eee63b17d9a39a4f
 
 
 	https://github.com/rollup/rollup