rollup 2.67.0 → 2.67.1

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup
@@ -12,8 +12,8 @@
 
 const require$$0$1 = require('fs');
 const require$$0 = require('path');
-const url = require('url');
 const process$1 = require('process');
+const url = require('url');
 const tty = require('tty');
 const rollup = require('./rollup.js');
 const mergeOptions = require('./mergeOptions.js');
@@ -29,7 +29,6 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-const require$$0__namespace = /*#__PURE__*/_interopNamespaceDefault(require$$0);
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
 const env = process.env || {};
@@ -143,7 +142,7 @@ const { bold, cyan, dim, gray, green, red, underline, yellow } = createColors({
 });
 
 // log to stderr to keep `rollup main.js > bundle.js` from breaking
-const stderr = (...args) => process.stderr.write(`${args.join('')}\n`);
+const stderr = (...args) => process$1.stderr.write(`${args.join('')}\n`);
 function handleError(err, recover = false) {
     let description = err.message || err;
     if (err.name)
@@ -167,7 +166,7 @@ function handleError(err, recover = false) {
     }
     stderr('');
     if (!recover)
-        process.exit(1);
+        process$1.exit(1);
 }
 
 function batchWarnings() {
@@ -267,6 +266,7 @@ const deferredHandlers = {
         title('Mixing named and default exports');
         info(`https://rollupjs.org/guide/en/#outputexports`);
         stderr(bold('The following entry modules are using named and default exports together:'));
+        warnings.sort((a, b) => (a.id < b.id ? -1 : 1));
         const displayedWarnings = warnings.length > 5 ? warnings.slice(0, 3) : warnings;
         for (const warning of displayedWarnings) {
             stderr(rollup.relativeId(warning.id));
@@ -405,8 +405,8 @@ function stdinPlugin(arg) {
 function readStdin() {
     return new Promise((resolve, reject) => {
         const chunks = [];
-        process.stdin.setEncoding('utf8');
-        process.stdin
+        process$1.stdin.setEncoding('utf8');
+        process$1.stdin
             .on('data', chunk => chunks.push(chunk))
             .on('end', () => {
             const result = chunks.join('');
@@ -505,7 +505,7 @@ async function loadAndRegisterPlugin(inputOptions, pluginText) {
         if (!plugin) {
             try {
                 if (pluginText[0] == '.')
-                    pluginText = require$$0__namespace.resolve(pluginText);
+                    pluginText = require$$0.resolve(pluginText);
                 plugin = await requireOrImport(pluginText);
             }
             catch (err) {
@@ -543,7 +543,7 @@ async function requireOrImport(pluginPath) {
 }
 
 function supportsNativeESM() {
-    return Number(/^v(\d+)/.exec(process.version)[1]) >= 13;
+    return Number(/^v(\d+)/.exec(process$1.version)[1]) >= 13;
 }
 async function loadAndParseConfigFile(fileName, commandOptions = {}) {
     const configs = await loadConfigFile(fileName, commandOptions);

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup
@@ -28,7 +28,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-var version$1 = "2.67.0";
+var version$1 = "2.67.1";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -12320,7 +12320,7 @@ class Module {
         this.alternativeReexportModules = new Map();
         this.ast = null;
         this.chunkFileNames = new Set();
-        this.chunkName = null;
+        this.chunkNames = [];
         this.cycles = new Set();
         this.dependencies = new Set();
         this.dynamicDependencies = new Set();
@@ -12343,7 +12343,6 @@ class Module {
         this.reexportDescriptions = Object.create(null);
         this.sideEffectDependenciesByVariable = new Map();
         this.sources = new Set();
-        this.userChunkNames = new Set();
         this.usesTopLevelAwait = false;
         this.allExportNames = null;
         this.exportAllModules = [];
@@ -13131,12 +13130,10 @@ function removeJsExtension(name) {
 }
 
 function getCompleteAmdId(options, chunkId) {
-    if (!options.autoId) {
-        return options.id || '';
-    }
-    else {
+    if (options.autoId) {
         return `${options.basePath ? options.basePath + '/' : ''}${removeJsExtension(chunkId)}`;
     }
+    return options.id || '';
 }
 
 function getExportBlock$1(exports, dependencies, namedExportsMode, interop, snippets, t, externalLiveBindings, mechanism = 'return ') {
@@ -14546,7 +14543,7 @@ class Chunk {
             }
         }
         for (const module of entryModules) {
-            const requiredFacades = Array.from(module.userChunkNames, name => ({
+            const requiredFacades = Array.from(new Set(module.chunkNames.filter(({ isUserDefined }) => isUserDefined).map(({ name }) => name)), name => ({
                 name
             }));
             if (requiredFacades.length === 0 && module.isUserDefinedEntryPoint) {
@@ -15039,7 +15036,7 @@ class Chunk {
             this.dynamicEntryModules[0] ||
             this.orderedModules[this.orderedModules.length - 1];
         if (moduleForNaming) {
-            return moduleForNaming.chunkName || getAliasName(moduleForNaming.id);
+            return getChunkNameFromModule(moduleForNaming);
         }
         return 'chunk';
     }
@@ -15411,7 +15408,8 @@ class Chunk {
     }
 }
 function getChunkNameFromModule(module) {
-    return module.chunkName || getAliasName(module.id);
+    var _a, _b, _c, _d;
+    return ((_d = (_b = (_a = module.chunkNames.find(({ isUserDefined }) => isUserDefined)) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : (_c = module.chunkNames[0]) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : getAliasName(module.id));
 }
 const QUERY_HASH_REGEX = /[?#]/;
 
@@ -21787,19 +21785,19 @@ async function resolveId(source, importer, preserveSymlinks, pluginDriver, modul
     // See https://nodejs.org/api/path.html#path_path_resolve_paths
     return addJsExtensionIfNecessary(importer ? require$$0.resolve(require$$0.dirname(importer), source) : require$$0.resolve(source), preserveSymlinks);
 }
-function addJsExtensionIfNecessary(file, preserveSymlinks) {
+async function addJsExtensionIfNecessary(file, preserveSymlinks) {
     var _a, _b;
-    return ((_b = (_a = findFile(file, preserveSymlinks)) !== null && _a !== void 0 ? _a : findFile(file + '.mjs', preserveSymlinks)) !== null && _b !== void 0 ? _b : findFile(file + '.js', preserveSymlinks));
+    return ((_b = (_a = (await findFile(file, preserveSymlinks))) !== null && _a !== void 0 ? _a : (await findFile(file + '.mjs', preserveSymlinks))) !== null && _b !== void 0 ? _b : (await findFile(file + '.js', preserveSymlinks)));
 }
-function findFile(file, preserveSymlinks) {
+async function findFile(file, preserveSymlinks) {
     try {
-        const stats = require$$0$1.lstatSync(file);
+        const stats = await require$$0$1.promises.lstat(file);
         if (!preserveSymlinks && stats.isSymbolicLink())
-            return findFile(require$$0$1.realpathSync(file), preserveSymlinks);
+            return await findFile(await require$$0$1.promises.realpath(file), preserveSymlinks);
         if ((preserveSymlinks && stats.isSymbolicLink()) || stats.isFile()) {
             // check case
             const name = require$$0.basename(file);
-            const files = require$$0$1.readdirSync(require$$0.dirname(file));
+            const files = await require$$0$1.promises.readdir(require$$0.dirname(file));
             if (files.includes(name))
                 return file;
         }
@@ -22069,6 +22067,7 @@ class ModuleLoader {
         this.latestLoadModulesPromise = Promise.resolve();
         this.moduleLoadPromises = new Map();
         this.modulesWithLoadedDependencies = new Set();
+        this.nextChunkNamePriority = 0;
         this.nextEntryModuleIndex = 0;
         this.resolveId = async (source, importer, customOptions, isEntry, skip = null) => {
             return this.getResolvedIdWithDefaults(this.getNormalizedResolvedIdWithoutDefaults(this.options.external(source, importer, false)
@@ -22088,21 +22087,24 @@ class ModuleLoader {
     async addEntryModules(unresolvedEntryModules, isUserDefined) {
         const firstEntryModuleIndex = this.nextEntryModuleIndex;
         this.nextEntryModuleIndex += unresolvedEntryModules.length;
+        const firstChunkNamePriority = this.nextChunkNamePriority;
+        this.nextChunkNamePriority += unresolvedEntryModules.length;
         const newEntryModules = await this.extendLoadModulesPromise(Promise.all(unresolvedEntryModules.map(({ id, importer }) => this.loadEntryModule(id, true, importer, null))).then(entryModules => {
-            let moduleIndex = firstEntryModuleIndex;
             for (let index = 0; index < entryModules.length; index++) {
                 const entryModule = entryModules[index];
                 entryModule.isUserDefinedEntryPoint =
                     entryModule.isUserDefinedEntryPoint || isUserDefined;
-                addChunkNamesToModule(entryModule, unresolvedEntryModules[index], isUserDefined);
+                addChunkNamesToModule(entryModule, unresolvedEntryModules[index], isUserDefined, firstChunkNamePriority + index);
                 const existingIndexedModule = this.indexedEntryModules.find(indexedModule => indexedModule.module === entryModule);
                 if (!existingIndexedModule) {
-                    this.indexedEntryModules.push({ index: moduleIndex, module: entryModule });
+                    this.indexedEntryModules.push({
+                        index: firstEntryModuleIndex + index,
+                        module: entryModule
+                    });
                 }
                 else {
-                    existingIndexedModule.index = Math.min(existingIndexedModule.index, moduleIndex);
+                    existingIndexedModule.index = Math.min(existingIndexedModule.index, firstEntryModuleIndex + index);
                 }
-                moduleIndex++;
             }
             this.indexedEntryModules.sort(({ index: indexA }, { index: indexB }) => indexA > indexB ? 1 : -1);
             return entryModules;
@@ -22134,8 +22136,9 @@ class ModuleLoader {
         return module.info;
     }
     addEntryWithImplicitDependants(unresolvedModule, implicitlyLoadedAfter) {
+        const chunkNamePriority = this.nextChunkNamePriority++;
         return this.extendLoadModulesPromise(this.loadEntryModule(unresolvedModule.id, false, unresolvedModule.importer, null).then(async (entryModule) => {
-            addChunkNamesToModule(entryModule, unresolvedModule, false);
+            addChunkNamesToModule(entryModule, unresolvedModule, false, chunkNamePriority);
             if (!entryModule.info.isEntry) {
                 this.implicitEntryModules.add(entryModule);
                 const implicitlyLoadedAfterModules = await Promise.all(implicitlyLoadedAfter.map(id => this.loadEntryModule(id, false, unresolvedModule.importer, entryModule.id)));
@@ -22457,17 +22460,17 @@ function normalizeRelativeExternalId(source, importer) {
             : require$$0.resolve(source)
         : source;
 }
-function addChunkNamesToModule(module, { fileName, name }, isUserDefined) {
+function addChunkNamesToModule(module, { fileName, name }, isUserDefined, priority) {
+    var _a;
     if (fileName !== null) {
         module.chunkFileNames.add(fileName);
     }
     else if (name !== null) {
-        if (module.chunkName === null) {
-            module.chunkName = name;
-        }
-        if (isUserDefined) {
-            module.userChunkNames.add(name);
-        }
+        // Always keep chunkNames sorted by priority
+        let namePosition = 0;
+        while (((_a = module.chunkNames[namePosition]) === null || _a === void 0 ? void 0 : _a.priority) < priority)
+            namePosition++;
+        module.chunkNames.splice(namePosition, 0, { isUserDefined, name, priority });
     }
 }
 function isNotAbsoluteExternal(id, source, makeAbsoluteExternalsRelative) {
@@ -22617,14 +22620,14 @@ function formatAction([pluginName, hookName, args]) {
     }
     return action;
 }
-process.on('exit', () => {
+process$1.on('exit', () => {
     if (unfulfilledActions.size) {
         let err = '[!] Error: unfinished hook action(s) on exit:\n';
         for (const action of unfulfilledActions) {
             err += formatAction(action) + '\n';
         }
         console.error('%s', err);
-        process.exit(1);
+        process$1.exit(1);
     }
 });
 

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup
@@ -147,7 +147,9 @@ const processOk = function (process) {
 // some kind of non-node environment, just no-op
 /* istanbul ignore if */
 if (!processOk(process$1)) {
-  signalExit.exports = function () {};
+  signalExit.exports = function () {
+    return function () {}
+  };
 } else {
   var assert = require$$0;
   var signals = signals$1.exports;
@@ -180,7 +182,7 @@ if (!processOk(process$1)) {
   signalExit.exports = function (cb, opts) {
     /* istanbul ignore if */
     if (!processOk(rollup.commonjsGlobal.process)) {
-      return
+      return function () {}
     }
     assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler');
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.0
-	Wed, 02 Feb 2022 06:19:08 GMT - commit 61d772ba59be605e53e72613ae51cee4b72aee64
+	Rollup.js v2.67.1
+	Mon, 07 Feb 2022 05:29:30 GMT - commit efd71e930e86ab30f4911ed8caa7f78aca005729
 
 
 	https://github.com/rollup/rollup
@@ -11,11 +11,11 @@
 'use strict';
 
 const require$$0 = require('path');
+const process = require('process');
 const rollup = require('./rollup.js');
 const mergeOptions = require('./mergeOptions.js');
 const require$$2 = require('os');
 const index = require('./index.js');
-require('process');
 require('perf_hooks');
 require('crypto');
 require('fs');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.67.0",
+  "version": "2.67.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -69,19 +69,19 @@
     "@types/node": "^10.17.60",
     "@types/signal-exit": "^3.0.1",
     "@types/yargs-parser": "^20.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.10.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
     "acorn": "^8.7.0",
     "acorn-jsx": "^5.3.2",
     "acorn-walk": "^8.2.0",
     "buble": "^0.20.0",
     "chokidar": "^3.5.3",
     "colorette": "^2.0.16",
-    "core-js": "^3.20.3",
+    "core-js": "^3.21.0",
     "date-time": "^4.0.0",
     "es5-shim": "^4.6.4",
     "es6-shim": "^0.35.6",
-    "eslint": "^8.7.0",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
@@ -94,20 +94,20 @@
     "lint-staged": "^10.5.4",
     "locate-character": "^2.0.5",
     "magic-string": "^0.25.7",
-    "mocha": "^9.1.4",
+    "mocha": "^9.2.0",
     "nyc": "^15.1.0",
     "pinst": "^2.1.6",
     "prettier": "^2.5.1",
     "pretty-bytes": "^5.6.0",
     "pretty-ms": "^7.0.1",
     "requirejs": "^2.3.6",
-    "rollup": "^2.65.0",
+    "rollup": "^2.67.0",
     "rollup-plugin-license": "^2.6.1",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-thatworks": "^1.0.4",
     "shx": "^0.3.4",
-    "signal-exit": "^3.0.6",
+    "signal-exit": "^3.0.7",
     "source-map": "^0.7.3",
     "source-map-support": "^0.5.21",
     "sourcemap-codec": "^1.4.8",