rollup 2.26.11 → 2.28.1

package/dist/rollup.d.ts

@@ -583,6 +583,7 @@ export interface OutputOptions {
 	plugins?: OutputPlugin[];
 	preferConst?: boolean;
 	preserveModules?: boolean;
+	preserveModulesRoot?: string;
 	sourcemap?: boolean | 'inline' | 'hidden';
 	sourcemapExcludeSources?: boolean;
 	sourcemapFile?: string;
@@ -628,6 +629,7 @@ export interface NormalizedOutputOptions {
 	plugins: OutputPlugin[];
 	preferConst: boolean;
 	preserveModules: boolean;
+	preserveModulesRoot: string | undefined;
 	sourcemap: boolean | 'inline' | 'hidden';
 	sourcemapExcludeSources: boolean;
 	sourcemapFile: string | undefined;

package/dist/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/shared/index.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/shared/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
@@ -11,6 +11,7 @@
 'use strict';
 
 var rollup = require('./rollup.js');
+var fs = require('fs');
 var sysPath = require('path');
 var mergeOptions = require('./mergeOptions.js');
 var url = require('url');
@@ -308,16 +309,17 @@ function showTruncatedWarnings(warnings) {
 
 const stdinName = '-';
 let stdinResult = null;
-function stdinPlugin() {
+function stdinPlugin(arg) {
+    const suffix = typeof arg == 'string' && arg.length ? '.' + arg : '';
     return {
         name: 'stdin',
         resolveId(id) {
             if (id === stdinName) {
-                return id;
+                return id + suffix;
             }
         },
         load(id) {
-            if (id === stdinName) {
+            if (id === stdinName || id.startsWith(stdinName + '.')) {
                 return stdinResult || (stdinResult = readStdin());
             }
         }
@@ -366,7 +368,7 @@ function waitForInputPlugin() {
 
 function addCommandPluginsToInputOptions(inputOptions, command) {
     if (command.stdin !== false) {
-        inputOptions.plugins.push(stdinPlugin());
+        inputOptions.plugins.push(stdinPlugin(command.stdin));
     }
     if (command.waitForBundleInput === true) {
         inputOptions.plugins.push(waitForInputPlugin());
@@ -501,17 +503,18 @@ async function getDefaultFromTranspiledConfigFile(fileName, silent) {
     return loadConfigFromBundledFile(fileName, code);
 }
 async function loadConfigFromBundledFile(fileName, bundledCode) {
-    const extension = sysPath.extname(fileName);
+    const resolvedFileName = fs.realpathSync(fileName);
+    const extension = sysPath.extname(resolvedFileName);
     const defaultLoader = require.extensions[extension];
-    require.extensions[extension] = (module, filename) => {
-        if (filename === fileName) {
-            module._compile(bundledCode, filename);
+    require.extensions[extension] = (module, requiredFileName) => {
+        if (requiredFileName === resolvedFileName) {
+            module._compile(bundledCode, requiredFileName);
         }
         else {
-            defaultLoader(module, filename);
+            defaultLoader(module, requiredFileName);
         }
     };
-    delete require.cache[fileName];
+    delete require.cache[resolvedFileName];
     try {
         const config = getDefaultFromCjs(require(fileName));
         require.extensions[extension] = defaultLoader;

package/dist/shared/mergeOptions.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
@@ -153,6 +153,7 @@ function mergeOutputOptions(config, overrides, warn) {
         plugins: rollup.ensureArray(config.plugins),
         preferConst: getOption('preferConst'),
         preserveModules: getOption('preserveModules'),
+        preserveModulesRoot: getOption('preserveModulesRoot'),
         sourcemap: getOption('sourcemap'),
         sourcemapExcludeSources: getOption('sourcemapExcludeSources'),
         sourcemapFile: getOption('sourcemapFile'),

package/dist/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
@@ -19,7 +19,7 @@ function _interopNamespaceDefaultOnly(e) {
   return {__proto__: null, 'default': e};
 }
 
-var version = "2.26.11";
+var version = "2.28.1";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -4728,9 +4728,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) +
@@ -7358,7 +7357,7 @@ class IfStatement extends NodeBase {
                 hoistedDeclarations.push(...this.alternateScope.hoistedDeclarations);
             }
         }
-        renderHoistedDeclarations(hoistedDeclarations, this.start, code);
+        this.renderHoistedDeclarations(hoistedDeclarations, code);
     }
     getTestValue() {
         if (this.testValue === unset) {
@@ -7399,6 +7398,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 {
@@ -7413,14 +7430,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() { }
@@ -11044,12 +11053,21 @@ class Chunk$1 {
                     ? '[name].js'
                     : '[name][extname].js'
                 : options.entryFileNames;
-            path = relative(preserveModulesRelativeDir, `${sysPath.dirname(sanitizedId)}/${renderNamePattern(pattern, 'output.entryFileNames', {
+            const currentDir = sysPath.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/${sysPath.basename(sanitizedId)}`;
@@ -19411,7 +19429,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;
 };
@@ -19550,6 +19568,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,
@@ -19634,6 +19653,13 @@ const getPreserveModules$1 = (config, inlineDynamicImports, inputOptions) => {
     }
     return preserveModules;
 };
+const getPreserveModulesRoot = (config) => {
+    const preserveModulesRoot = config.preserveModulesRoot;
+    if (preserveModulesRoot === null || preserveModulesRoot === undefined) {
+        return undefined;
+    }
+    return sysPath.resolve(preserveModulesRoot);
+};
 const getAmd = (config) => ({
     define: 'define',
     ...config.amd

package/dist/shared/watch-cli.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/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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.26.11",
+  "version": "2.28.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -71,13 +71,13 @@
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-replace": "^2.3.3",
     "@types/micromatch": "^4.0.1",
-    "@types/node": "^14.0.27",
+    "@types/node": "^14.10.2",
     "@types/require-relative": "^0.8.0",
     "@types/signal-exit": "^3.0.0",
     "@types/yargs-parser": "^15.0.0",
     "acorn": "^8.0.1",
     "acorn-class-fields": "^0.3.7",
-    "acorn-jsx": "^5.2.0",
+    "acorn-jsx": "^5.3.1",
     "acorn-numeric-separator": "^0.3.6",
     "acorn-static-class-features": "^0.2.4",
     "acorn-walk": "^8.0.0",
@@ -90,30 +90,30 @@
     "date-time": "^3.1.0",
     "es5-shim": "^4.5.14",
     "es6-shim": "^0.35.5",
-    "eslint": "^7.6.0",
+    "eslint": "^7.9.0",
     "eslint-plugin-import": "^2.22.0",
     "execa": "^4.0.3",
     "fixturify": "^2.1.0",
     "hash.js": "^1.1.7",
-    "husky": "^4.2.5",
+    "husky": "^4.3.0",
     "is-reference": "^1.2.1",
-    "lint-staged": "^10.2.11",
+    "lint-staged": "^10.3.0",
     "locate-character": "^2.0.5",
     "magic-string": "^0.25.7",
     "markdownlint-cli": "^0.23.2",
     "micromatch": "^4.0.2",
-    "mocha": "^8.1.1",
-    "node-fetch": "^2.6.0",
+    "mocha": "^8.1.3",
+    "node-fetch": "^2.6.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.0.5",
-    "pretty-bytes": "^5.3.0",
+    "prettier": "^2.1.2",
+    "pretty-bytes": "^5.4.1",
     "pretty-ms": "^7.0.0",
     "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^2.23.1",
+    "rollup": "^2.26.11",
     "rollup-plugin-license": "^2.2.0",
     "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-terser": "^7.0.0",
+    "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-thatworks": "^1.0.4",
     "rollup-plugin-typescript": "^1.0.1",
     "rollup-pluginutils": "^2.8.2",
@@ -123,13 +123,13 @@
     "source-map": "^0.7.3",
     "source-map-support": "^0.5.19",
     "sourcemap-codec": "^1.4.8",
-    "systemjs": "^6.5.0",
-    "terser": "^5.0.0",
+    "systemjs": "^6.6.1",
+    "terser": "^5.3.1",
     "tslib": "^2.0.1",
     "tslint": "^6.1.3",
-    "typescript": "^3.9.7",
+    "typescript": "^4.0.2",
     "url-parse": "^1.4.7",
-    "yargs-parser": "^19.0.1"
+    "yargs-parser": "^20.0.0"
   },
   "files": [
     "dist/**/*.js",