rollup 2.61.0 → 2.61.1

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup
@@ -26,7 +26,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-var version$1 = "2.61.0";
+var version$1 = "2.61.1";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -6565,62 +6565,61 @@ function toBase64(num) {
     return outStr;
 }
 
-const RESERVED_NAMES = {
-    __proto__: null,
-    await: true,
-    break: true,
-    case: true,
-    catch: true,
-    class: true,
-    const: true,
-    continue: true,
-    debugger: true,
-    default: true,
-    delete: true,
-    do: true,
-    else: true,
-    enum: true,
-    eval: true,
-    export: true,
-    extends: true,
-    false: true,
-    finally: true,
-    for: true,
-    function: true,
-    if: true,
-    implements: true,
-    import: true,
-    in: true,
-    instanceof: true,
-    interface: true,
-    let: true,
-    new: true,
-    null: true,
-    package: true,
-    private: true,
-    protected: true,
-    public: true,
-    return: true,
-    static: true,
-    super: true,
-    switch: true,
-    this: true,
-    throw: true,
-    true: true,
-    try: true,
-    typeof: true,
-    undefined: true,
-    var: true,
-    void: true,
-    while: true,
-    with: true,
-    yield: true
-};
+const RESERVED_NAMES = new Set([
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'enum',
+    'eval',
+    'export',
+    'extends',
+    'false',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'implements',
+    'import',
+    'in',
+    'instanceof',
+    'interface',
+    'let',
+    'new',
+    'null',
+    'package',
+    'private',
+    'protected',
+    'public',
+    'return',
+    'static',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'true',
+    'try',
+    'typeof',
+    'undefined',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield'
+]);
 
 function getSafeName(baseName, usedNames) {
     let safeName = baseName;
     let count = 1;
-    while (usedNames.has(safeName) || RESERVED_NAMES[safeName]) {
+    while (usedNames.has(safeName) || RESERVED_NAMES.has(safeName)) {
         safeName = `${baseName}$${toBase64(count++)}`;
     }
     usedNames.add(safeName);
@@ -12325,10 +12324,10 @@ class Module {
             hasModuleSideEffects,
             id,
             get implicitlyLoadedAfterOneOf() {
-                return Array.from(module.implicitlyLoadedAfter, getId);
+                return Array.from(module.implicitlyLoadedAfter, getId).sort();
             },
             get implicitlyLoadedBefore() {
-                return Array.from(module.implicitlyLoadedBefore, getId);
+                return Array.from(module.implicitlyLoadedBefore, getId).sort();
             },
             get importedIds() {
                 return Array.from(module.sources, source => { var _a; return (_a = module.resolvedIds[source]) === null || _a === void 0 ? void 0 : _a.id; }).filter(Boolean);
@@ -14137,7 +14136,7 @@ function assignExportsToMangledNames(exports, exportsByName, exportNamesByVariab
                     nameIndex += 9 * 64 ** (exportName.length - 1);
                     exportName = toBase64(nameIndex);
                 }
-            } while (RESERVED_NAMES[exportName] || exportsByName[exportName]);
+            } while (RESERVED_NAMES.has(exportName) || exportsByName[exportName]);
         }
         exportsByName[exportName] = variable;
         exportNamesByVariable.set(variable, [exportName]);
@@ -15872,7 +15871,7 @@ function getGenerateCodeSnippets({ compact, generatedCode: { arrowFunctions, con
     ];
     const isValidPropName = reservedNamesAsProps
         ? (name) => validPropName.test(name)
-        : (name) => !RESERVED_NAMES[name] && validPropName.test(name);
+        : (name) => !RESERVED_NAMES.has(name) && validPropName.test(name);
     return {
         _,
         cnst,
@@ -22008,6 +22007,7 @@ class ModuleLoader {
         this.indexedEntryModules = [];
         this.latestLoadModulesPromise = Promise.resolve();
         this.moduleLoadPromises = new Map();
+        this.modulesWithLoadedDependencies = new Set();
         this.nextEntryModuleIndex = 0;
         this.readQueue = new Queue();
         this.resolveId = async (source, importer, customOptions, isEntry, skip = null) => {
@@ -22186,7 +22186,8 @@ class ModuleLoader {
         this.graph.watchFiles[id] = true;
         const loadPromise = this.addModuleSource(id, importer, module).then(() => [
             this.getResolveStaticDependencyPromises(module),
-            this.getResolveDynamicImportPromises(module)
+            this.getResolveDynamicImportPromises(module),
+            loadAndResolveDependenciesPromise
         ]);
         const loadAndResolveDependenciesPromise = loadPromise
             .then(([resolveStaticDependencyPromises, resolveDynamicImportPromises]) => Promise.all([...resolveStaticDependencyPromises, ...resolveDynamicImportPromises]))
@@ -22194,23 +22195,25 @@ class ModuleLoader {
         loadAndResolveDependenciesPromise.catch(() => {
             /* avoid unhandled promise rejections */
         });
-        if (isPreload) {
-            this.moduleLoadPromises.set(module, loadPromise);
-            await loadPromise;
-        }
-        else {
-            await this.fetchModuleDependencies(module, ...(await loadPromise));
-            // To handle errors when resolving dependencies or in moduleParsed
-            await loadAndResolveDependenciesPromise;
+        this.moduleLoadPromises.set(module, loadPromise);
+        const resolveDependencyPromises = await loadPromise;
+        if (!isPreload) {
+            await this.fetchModuleDependencies(module, ...resolveDependencyPromises);
         }
         return module;
     }
-    async fetchModuleDependencies(module, resolveStaticDependencyPromises, resolveDynamicDependencyPromises) {
+    async fetchModuleDependencies(module, resolveStaticDependencyPromises, resolveDynamicDependencyPromises, loadAndResolveDependenciesPromise) {
+        if (this.modulesWithLoadedDependencies.has(module)) {
+            return;
+        }
+        this.modulesWithLoadedDependencies.add(module);
         await Promise.all([
             this.fetchStaticDependencies(module, resolveStaticDependencyPromises),
             this.fetchDynamicDependencies(module, resolveDynamicDependencyPromises)
         ]);
         module.linkImports();
+        // To handle errors when resolving dependencies or in moduleParsed
+        await loadAndResolveDependenciesPromise;
     }
     fetchResolvedDependency(source, importer, resolvedId) {
         if (resolvedId.external) {
@@ -22299,8 +22302,7 @@ class ModuleLoader {
     async handleExistingModule(module, isEntry, isPreload) {
         const loadPromise = this.moduleLoadPromises.get(module);
         if (isPreload) {
-            await loadPromise;
-            return;
+            return loadPromise;
         }
         if (isEntry) {
             module.info.isEntry = true;
@@ -22310,11 +22312,7 @@ class ModuleLoader {
             }
             module.implicitlyLoadedAfter.clear();
         }
-        if (loadPromise) {
-            this.moduleLoadPromises.delete(module);
-            await this.fetchModuleDependencies(module, ...(await loadPromise));
-        }
-        return;
+        return this.fetchModuleDependencies(module, ...(await loadPromise));
     }
     handleResolveId(resolvedId, source, importer) {
         if (resolvedId === null) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.61.0
-	Thu, 09 Dec 2021 05:43:43 GMT - commit 49d41f78987a1dd13488df009fe2db1b5d1b6e7c
+	Rollup.js v2.61.1
+	Sat, 11 Dec 2021 06:17:07 GMT - commit 2e91c85fc95bc722e5a7141d7fa0acde4aab61aa
 
 
 	https://github.com/rollup/rollup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.61.0",
+  "version": "2.61.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",