rollup 2.59.0 → 2.60.0

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.59.0
-	Mon, 01 Nov 2021 06:11:12 GMT - commit 66b3139b4be1d52342088dc00ef89fb9412f639a
+	Rollup.js v2.60.0
+	Fri, 12 Nov 2021 05:12:41 GMT - commit 8d98341bf746d4baa57bbd730b1fa6449555cfca
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.59.0
-	Mon, 01 Nov 2021 06:11:12 GMT - commit 66b3139b4be1d52342088dc00ef89fb9412f639a
+	Rollup.js v2.60.0
+	Fri, 12 Nov 2021 05:12:41 GMT - commit 8d98341bf746d4baa57bbd730b1fa6449555cfca
 
 
 	https://github.com/rollup/rollup
@@ -13,7 +13,7 @@ import { createHash as createHash$1 } from 'crypto';
 import fs, { lstatSync, realpathSync, readdirSync } from 'fs';
 import { EventEmitter } from 'events';
 
-var version$1 = "2.59.0";
+var version$1 = "2.60.0";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -12227,7 +12227,7 @@ class Module {
                 return Array.from(module.implicitlyLoadedBefore, getId);
             },
             get importedIds() {
-                return Array.from(module.sources, source => module.resolvedIds[source].id);
+                return Array.from(module.sources, source => { var _a; return (_a = module.resolvedIds[source]) === null || _a === void 0 ? void 0 : _a.id; }).filter(Boolean);
             },
             get importers() {
                 return module.importers.sort();
@@ -21890,6 +21890,7 @@ class ModuleLoader {
         this.implicitEntryModules = new Set();
         this.indexedEntryModules = [];
         this.latestLoadModulesPromise = Promise.resolve();
+        this.moduleLoadPromises = new Map();
         this.nextEntryModuleIndex = 0;
         this.readQueue = new Queue();
         this.resolveId = async (source, importer, customOptions, isEntry, skip = null) => {
@@ -21951,6 +21952,9 @@ class ModuleLoader {
         }
         return module;
     }
+    preloadModule(resolvedId) {
+        return this.fetchModule(this.addDefaultsToResolvedId(resolvedId), undefined, false, true).then(module => module.info);
+    }
     addDefaultsToResolvedId(resolvedId) {
         var _a, _b;
         if (!resolvedId) {
@@ -22051,39 +22055,45 @@ class ModuleLoader {
             }
         }
     }
-    async fetchModule({ id, meta, moduleSideEffects, syntheticNamedExports }, importer, isEntry) {
+    // If this is a preload, then this method always waits for the dependencies of the module to be resolved.
+    // Otherwise if the module does not exist, it waits for the module and all its dependencies to be loaded.
+    // Otherwise it returns immediately.
+    async fetchModule({ id, meta, moduleSideEffects, syntheticNamedExports }, importer, isEntry, isPreload) {
         const existingModule = this.modulesById.get(id);
         if (existingModule instanceof Module) {
-            if (isEntry) {
-                existingModule.info.isEntry = true;
-                this.implicitEntryModules.delete(existingModule);
-                for (const dependant of existingModule.implicitlyLoadedAfter) {
-                    dependant.implicitlyLoadedBefore.delete(existingModule);
-                }
-                existingModule.implicitlyLoadedAfter.clear();
-            }
+            await this.handleExistingModule(existingModule, isEntry, isPreload);
             return existingModule;
         }
         const module = new Module(this.graph, id, this.options, isEntry, moduleSideEffects, syntheticNamedExports, meta);
         this.modulesById.set(id, module);
         this.graph.watchFiles[id] = true;
-        await this.addModuleSource(id, importer, module);
-        const resolveStaticDependencyPromises = this.getResolveStaticDependencyPromises(module);
-        const resolveDynamicImportPromises = this.getResolveDynamicImportPromises(module);
-        Promise.all([
-            ...resolveStaticDependencyPromises,
-            ...resolveDynamicImportPromises
-        ])
-            .then(() => this.pluginDriver.hookParallel('moduleParsed', [module.info]))
-            .catch(() => {
-            /* rejections thrown here are also handled within PluginDriver - they are safe to ignore */
+        const loadPromise = this.addModuleSource(id, importer, module).then(() => [
+            this.getResolveStaticDependencyPromises(module),
+            this.getResolveDynamicImportPromises(module)
+        ]);
+        const loadAndResolveDependenciesPromise = loadPromise
+            .then(([resolveStaticDependencyPromises, resolveDynamicImportPromises]) => Promise.all([...resolveStaticDependencyPromises, ...resolveDynamicImportPromises]))
+            .then(() => this.pluginDriver.hookParallel('moduleParsed', [module.info]));
+        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;
+        }
+        return module;
+    }
+    async fetchModuleDependencies(module, resolveStaticDependencyPromises, resolveDynamicDependencyPromises) {
         await Promise.all([
             this.fetchStaticDependencies(module, resolveStaticDependencyPromises),
-            this.fetchDynamicDependencies(module, resolveDynamicImportPromises)
+            this.fetchDynamicDependencies(module, resolveDynamicDependencyPromises)
         ]);
         module.linkImports();
-        return module;
     }
     fetchResolvedDependency(source, importer, resolvedId) {
         if (resolvedId.external) {
@@ -22098,7 +22108,7 @@ class ModuleLoader {
             return Promise.resolve(externalModule);
         }
         else {
-            return this.fetchModule(resolvedId, importer, false);
+            return this.fetchModule(resolvedId, importer, false, false);
         }
     }
     async fetchStaticDependencies(module, resolveStaticDependencyPromises) {
@@ -22169,6 +22179,26 @@ class ModuleLoader {
                     this.handleResolveId(await this.resolveId(source, module.id, EMPTY_OBJECT, false), source, module.id))
         ]);
     }
+    async handleExistingModule(module, isEntry, isPreload) {
+        const loadPromise = this.moduleLoadPromises.get(module);
+        if (isPreload) {
+            await loadPromise;
+            return;
+        }
+        if (isEntry) {
+            module.info.isEntry = true;
+            this.implicitEntryModules.delete(module);
+            for (const dependant of module.implicitlyLoadedAfter) {
+                dependant.implicitlyLoadedBefore.delete(module);
+            }
+            module.implicitlyLoadedAfter.clear();
+        }
+        if (loadPromise) {
+            this.moduleLoadPromises.delete(module);
+            await this.fetchModuleDependencies(module, ...(await loadPromise));
+        }
+        return;
+    }
     handleResolveId(resolvedId, source, importer) {
         if (resolvedId === null) {
             if (isRelative(source)) {
@@ -22205,7 +22235,7 @@ class ModuleLoader {
         }
         return this.fetchModule(this.addDefaultsToResolvedId(typeof resolveIdResult === 'object'
             ? resolveIdResult
-            : { id: resolveIdResult }), undefined, isEntry);
+            : { id: resolveIdResult }), undefined, isEntry, false);
     }
     async resolveDynamicImport(module, specifier, importer) {
         const resolution = await this.pluginDriver.hookFirst('resolveDynamicImport', [
@@ -22333,12 +22363,16 @@ function getPluginContext(plugin, pluginCache, graph, options, fileEmitter, exis
         getModuleInfo: graph.getModuleInfo,
         getWatchFiles: () => Object.keys(graph.watchFiles),
         isExternal: getDeprecatedContextHandler((id, parentId, isResolved = false) => options.external(id, parentId, isResolved), 'isExternal', 'resolve', plugin.name, true, options),
+        load(resolvedId) {
+            return graph.moduleLoader.preloadModule(resolvedId);
+        },
         meta: {
             rollupVersion: version$1,
             watchMode: graph.watchMode
         },
         get moduleIds() {
             function* wrappedModuleIds() {
+                // We are wrapping this in a generator to only show the message once we are actually iterating
                 warnDeprecation({
                     message: `Accessing "this.moduleIds" on the plugin context by plugin ${plugin.name} is deprecated. The "this.getModuleIds" plugin context function should be used instead.`,
                     plugin: plugin.name
@@ -23050,12 +23084,15 @@ const getHasModuleSideEffects = (moduleSideEffectsOption, pureExternalModules) =
     return (id, external) => !(external && isPureExternalModule(id));
 };
 
+// https://datatracker.ietf.org/doc/html/rfc2396
+// eslint-disable-next-line no-control-regex
+const INVALID_CHAR_RE = /[\x00-\x1F\x7F<>*#"{}|^[\]`;?:&=+$,]/g;
 function sanitizeFileName(name) {
     const match = /^[a-z]:/i.exec(name);
     const driveLetter = match ? match[0] : '';
     // A `:` is only allowed as part of a windows drive letter (ex: C:\foo)
     // Otherwise, avoid them because they can refer to NTFS alternate data streams.
-    return driveLetter + name.substr(driveLetter.length).replace(/[\0?*:]/g, '_');
+    return driveLetter + name.substr(driveLetter.length).replace(INVALID_CHAR_RE, '_');
 }
 
 function normalizeOutputOptions(config, inputOptions, unsetInputOptions) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.59.0
-	Mon, 01 Nov 2021 06:11:12 GMT - commit 66b3139b4be1d52342088dc00ef89fb9412f639a
+	Rollup.js v2.60.0
+	Fri, 12 Nov 2021 05:12:41 GMT - commit 8d98341bf746d4baa57bbd730b1fa6449555cfca
 
 
 	https://github.com/rollup/rollup

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.59.0
-	Mon, 01 Nov 2021 06:11:12 GMT - commit 66b3139b4be1d52342088dc00ef89fb9412f639a
+	Rollup.js v2.60.0
+	Fri, 12 Nov 2021 05:12:41 GMT - commit 8d98341bf746d4baa57bbd730b1fa6449555cfca
 
 
 	https://github.com/rollup/rollup