rollup 3.20.0 → 3.20.2

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/node-entry.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/pr
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.20.0";
+var version$1 = "3.20.2";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -2030,6 +2030,9 @@ const MIN_CHARACTERS_SHOWN_AFTER_LOCATION = 10;
 const ELLIPSIS = '...';
 function getCodeFrame(source, line, column) {
     let lines = source.split('\n');
+    // Needed if a plugin did not generate correct sourcemaps
+    if (line > lines.length)
+        return '';
     const maxLineLength = Math.max(tabsToSpaces(lines[line - 1].slice(0, column)).length +
         MIN_CHARACTERS_SHOWN_AFTER_LOCATION +
         ELLIPSIS.length, LINE_TRUNCATE_LENGTH);
@@ -11626,6 +11629,9 @@ class Program extends NodeBase {
         this.hasLoggedEffect = false;
     }
     hasCachedEffects() {
+        if (!this.included) {
+            return false;
+        }
         return this.hasCachedEffect === null
             ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
             : this.hasCachedEffect;
@@ -23981,12 +23987,12 @@ class FileEmitter {
             }
             const source = getValidSource(requestedSource, consumedFile, referenceId);
             if (this.output) {
-                this.finalizeAsset(consumedFile, source, referenceId, this.output);
+                this.finalizeAdditionalAsset(consumedFile, source, this.output);
             }
             else {
                 consumedFile.source = source;
                 for (const emitter of this.outputFileEmitters) {
-                    emitter.finalizeAsset(consumedFile, source, referenceId, emitter.output);
+                    emitter.finalizeAdditionalAsset(consumedFile, source, emitter.output);
                 }
             }
         };
@@ -24004,11 +24010,21 @@ class FileEmitter {
                     reserveFileNameInBundle(emittedFile.fileName, output, this.options.onwarn);
                 }
             }
-            for (const [referenceId, consumedFile] of this.filesByReferenceId) {
+            const consumedAssetsByHash = new Map();
+            for (const consumedFile of this.filesByReferenceId.values()) {
                 if (consumedFile.type === 'asset' && consumedFile.source !== undefined) {
-                    this.finalizeAsset(consumedFile, consumedFile.source, referenceId, output);
+                    if (consumedFile.fileName) {
+                        this.finalizeAdditionalAsset(consumedFile, consumedFile.source, output);
+                    }
+                    else {
+                        const sourceHash = getSourceHash(consumedFile.source);
+                        getOrCreate(consumedAssetsByHash, sourceHash, () => []).push(consumedFile);
+                    }
                 }
             }
+            for (const [sourceHash, consumedFiles] of consumedAssetsByHash) {
+                this.finalizeAssetsWithSameSource(consumedFiles, sourceHash, output);
+            }
         };
         this.filesByReferenceId = baseFileEmitter
             ? new Map(baseFileEmitter.filesByReferenceId)
@@ -24024,6 +24040,7 @@ class FileEmitter {
             referenceId = createHash().update(referenceId).digest('hex').slice(0, 8);
         } while (this.filesByReferenceId.has(referenceId) ||
             this.outputFileEmitters.some(({ filesByReferenceId }) => filesByReferenceId.has(referenceId)));
+        file.referenceId = referenceId;
         this.filesByReferenceId.set(referenceId, file);
         for (const { filesByReferenceId } of this.outputFileEmitters) {
             filesByReferenceId.set(referenceId, file);
@@ -24038,27 +24055,28 @@ class FileEmitter {
             fileName: emittedAsset.fileName,
             name: emittedAsset.name,
             needsCodeReference: !!emittedAsset.needsCodeReference,
+            referenceId: '',
             source,
             type: 'asset'
         };
         const referenceId = this.assignReferenceId(consumedAsset, emittedAsset.fileName || emittedAsset.name || String(this.nextIdBase++));
         if (this.output) {
-            this.emitAssetWithReferenceId(consumedAsset, referenceId, this.output);
+            this.emitAssetWithReferenceId(consumedAsset, this.output);
         }
         else {
             for (const fileEmitter of this.outputFileEmitters) {
-                fileEmitter.emitAssetWithReferenceId(consumedAsset, referenceId, fileEmitter.output);
+                fileEmitter.emitAssetWithReferenceId(consumedAsset, fileEmitter.output);
             }
         }
         return referenceId;
     }
-    emitAssetWithReferenceId(consumedAsset, referenceId, output) {
+    emitAssetWithReferenceId(consumedAsset, output) {
         const { fileName, source } = consumedAsset;
         if (fileName) {
             reserveFileNameInBundle(fileName, output, this.options.onwarn);
         }
         if (source !== undefined) {
-            this.finalizeAsset(consumedAsset, source, referenceId, output);
+            this.finalizeAdditionalAsset(consumedAsset, source, output);
         }
     }
     emitChunk(emittedChunk) {
@@ -24072,6 +24090,7 @@ class FileEmitter {
             fileName: emittedChunk.fileName,
             module: null,
             name: emittedChunk.name || emittedChunk.id,
+            referenceId: '',
             type: 'chunk'
         };
         this.graph.moduleLoader
@@ -24083,32 +24102,59 @@ class FileEmitter {
         });
         return this.assignReferenceId(consumedChunk, emittedChunk.id);
     }
-    finalizeAsset(consumedFile, source, referenceId, { bundle, fileNamesBySource, outputOptions }) {
-        let fileName = consumedFile.fileName;
+    finalizeAdditionalAsset(consumedFile, source, { bundle, fileNamesBySource, outputOptions }) {
+        let { fileName, needsCodeReference, referenceId } = consumedFile;
         // Deduplicate assets if an explicit fileName is not provided
         if (!fileName) {
             const sourceHash = getSourceHash(source);
             fileName = fileNamesBySource.get(sourceHash);
-            const newFileName = generateAssetFileName(consumedFile.name, source, sourceHash, outputOptions, bundle);
-            // make sure file name deterministic in parallel emits, always use the shorter and smaller file name
-            if (!fileName ||
-                fileName.length > newFileName.length ||
-                (fileName.length === newFileName.length && fileName > newFileName)) {
-                if (fileName) {
-                    delete bundle[fileName];
-                }
-                fileName = newFileName;
+            if (!fileName) {
+                fileName = generateAssetFileName(consumedFile.name, source, sourceHash, outputOptions, bundle);
                 fileNamesBySource.set(sourceHash, fileName);
             }
         }
         // We must not modify the original assets to avoid interaction between outputs
         const assetWithFileName = { ...consumedFile, fileName, source };
         this.filesByReferenceId.set(referenceId, assetWithFileName);
+        const existingAsset = bundle[fileName];
+        if (existingAsset?.type === 'asset') {
+            existingAsset.needsCodeReference && (existingAsset.needsCodeReference = needsCodeReference);
+        }
+        else {
+            bundle[fileName] = {
+                fileName,
+                name: consumedFile.name,
+                needsCodeReference,
+                source,
+                type: 'asset'
+            };
+        }
+    }
+    finalizeAssetsWithSameSource(consumedFiles, sourceHash, { bundle, fileNamesBySource, outputOptions }) {
+        let fileName = '';
+        let usedConsumedFile;
+        let needsCodeReference = true;
+        for (const consumedFile of consumedFiles) {
+            needsCodeReference && (needsCodeReference = consumedFile.needsCodeReference);
+            const assetFileName = generateAssetFileName(consumedFile.name, consumedFile.source, sourceHash, outputOptions, bundle);
+            if (!fileName ||
+                assetFileName.length < fileName.length ||
+                (assetFileName.length === fileName.length && assetFileName < fileName)) {
+                fileName = assetFileName;
+                usedConsumedFile = consumedFile;
+            }
+        }
+        fileNamesBySource.set(sourceHash, fileName);
+        for (const consumedFile of consumedFiles) {
+            // We must not modify the original assets to avoid interaction between outputs
+            const assetWithFileName = { ...consumedFile, fileName };
+            this.filesByReferenceId.set(consumedFile.referenceId, assetWithFileName);
+        }
         bundle[fileName] = {
             fileName,
-            name: consumedFile.name,
-            needsCodeReference: consumedFile.needsCodeReference,
-            source,
+            name: usedConsumedFile.name,
+            needsCodeReference,
+            source: usedConsumedFile.source,
             type: 'asset'
         };
     }

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/shared/fsevents-importer.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.20.0";
+var version$1 = "3.20.2";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -147,6 +147,9 @@ const MIN_CHARACTERS_SHOWN_AFTER_LOCATION = 10;
 const ELLIPSIS = '...';
 function getCodeFrame(source, line, column) {
     let lines = source.split('\n');
+    // Needed if a plugin did not generate correct sourcemaps
+    if (line > lines.length)
+        return '';
     const maxLineLength = Math.max(tabsToSpaces(lines[line - 1].slice(0, column)).length +
         MIN_CHARACTERS_SHOWN_AFTER_LOCATION +
         ELLIPSIS.length, LINE_TRUNCATE_LENGTH);
@@ -12124,6 +12127,9 @@ class Program extends NodeBase {
         this.hasLoggedEffect = false;
     }
     hasCachedEffects() {
+        if (!this.included) {
+            return false;
+        }
         return this.hasCachedEffect === null
             ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
             : this.hasCachedEffect;
@@ -24479,12 +24485,12 @@ class FileEmitter {
             }
             const source = getValidSource(requestedSource, consumedFile, referenceId);
             if (this.output) {
-                this.finalizeAsset(consumedFile, source, referenceId, this.output);
+                this.finalizeAdditionalAsset(consumedFile, source, this.output);
             }
             else {
                 consumedFile.source = source;
                 for (const emitter of this.outputFileEmitters) {
-                    emitter.finalizeAsset(consumedFile, source, referenceId, emitter.output);
+                    emitter.finalizeAdditionalAsset(consumedFile, source, emitter.output);
                 }
             }
         };
@@ -24502,11 +24508,21 @@ class FileEmitter {
                     reserveFileNameInBundle(emittedFile.fileName, output, this.options.onwarn);
                 }
             }
-            for (const [referenceId, consumedFile] of this.filesByReferenceId) {
+            const consumedAssetsByHash = new Map();
+            for (const consumedFile of this.filesByReferenceId.values()) {
                 if (consumedFile.type === 'asset' && consumedFile.source !== undefined) {
-                    this.finalizeAsset(consumedFile, consumedFile.source, referenceId, output);
+                    if (consumedFile.fileName) {
+                        this.finalizeAdditionalAsset(consumedFile, consumedFile.source, output);
+                    }
+                    else {
+                        const sourceHash = getSourceHash(consumedFile.source);
+                        getOrCreate(consumedAssetsByHash, sourceHash, () => []).push(consumedFile);
+                    }
                 }
             }
+            for (const [sourceHash, consumedFiles] of consumedAssetsByHash) {
+                this.finalizeAssetsWithSameSource(consumedFiles, sourceHash, output);
+            }
         };
         this.filesByReferenceId = baseFileEmitter
             ? new Map(baseFileEmitter.filesByReferenceId)
@@ -24522,6 +24538,7 @@ class FileEmitter {
             referenceId = createHash().update(referenceId).digest('hex').slice(0, 8);
         } while (this.filesByReferenceId.has(referenceId) ||
             this.outputFileEmitters.some(({ filesByReferenceId }) => filesByReferenceId.has(referenceId)));
+        file.referenceId = referenceId;
         this.filesByReferenceId.set(referenceId, file);
         for (const { filesByReferenceId } of this.outputFileEmitters) {
             filesByReferenceId.set(referenceId, file);
@@ -24536,27 +24553,28 @@ class FileEmitter {
             fileName: emittedAsset.fileName,
             name: emittedAsset.name,
             needsCodeReference: !!emittedAsset.needsCodeReference,
+            referenceId: '',
             source,
             type: 'asset'
         };
         const referenceId = this.assignReferenceId(consumedAsset, emittedAsset.fileName || emittedAsset.name || String(this.nextIdBase++));
         if (this.output) {
-            this.emitAssetWithReferenceId(consumedAsset, referenceId, this.output);
+            this.emitAssetWithReferenceId(consumedAsset, this.output);
         }
         else {
             for (const fileEmitter of this.outputFileEmitters) {
-                fileEmitter.emitAssetWithReferenceId(consumedAsset, referenceId, fileEmitter.output);
+                fileEmitter.emitAssetWithReferenceId(consumedAsset, fileEmitter.output);
             }
         }
         return referenceId;
     }
-    emitAssetWithReferenceId(consumedAsset, referenceId, output) {
+    emitAssetWithReferenceId(consumedAsset, output) {
         const { fileName, source } = consumedAsset;
         if (fileName) {
             reserveFileNameInBundle(fileName, output, this.options.onwarn);
         }
         if (source !== undefined) {
-            this.finalizeAsset(consumedAsset, source, referenceId, output);
+            this.finalizeAdditionalAsset(consumedAsset, source, output);
         }
     }
     emitChunk(emittedChunk) {
@@ -24570,6 +24588,7 @@ class FileEmitter {
             fileName: emittedChunk.fileName,
             module: null,
             name: emittedChunk.name || emittedChunk.id,
+            referenceId: '',
             type: 'chunk'
         };
         this.graph.moduleLoader
@@ -24581,32 +24600,59 @@ class FileEmitter {
         });
         return this.assignReferenceId(consumedChunk, emittedChunk.id);
     }
-    finalizeAsset(consumedFile, source, referenceId, { bundle, fileNamesBySource, outputOptions }) {
-        let fileName = consumedFile.fileName;
+    finalizeAdditionalAsset(consumedFile, source, { bundle, fileNamesBySource, outputOptions }) {
+        let { fileName, needsCodeReference, referenceId } = consumedFile;
         // Deduplicate assets if an explicit fileName is not provided
         if (!fileName) {
             const sourceHash = getSourceHash(source);
             fileName = fileNamesBySource.get(sourceHash);
-            const newFileName = generateAssetFileName(consumedFile.name, source, sourceHash, outputOptions, bundle);
-            // make sure file name deterministic in parallel emits, always use the shorter and smaller file name
-            if (!fileName ||
-                fileName.length > newFileName.length ||
-                (fileName.length === newFileName.length && fileName > newFileName)) {
-                if (fileName) {
-                    delete bundle[fileName];
-                }
-                fileName = newFileName;
+            if (!fileName) {
+                fileName = generateAssetFileName(consumedFile.name, source, sourceHash, outputOptions, bundle);
                 fileNamesBySource.set(sourceHash, fileName);
             }
         }
         // We must not modify the original assets to avoid interaction between outputs
         const assetWithFileName = { ...consumedFile, fileName, source };
         this.filesByReferenceId.set(referenceId, assetWithFileName);
+        const existingAsset = bundle[fileName];
+        if (existingAsset?.type === 'asset') {
+            existingAsset.needsCodeReference && (existingAsset.needsCodeReference = needsCodeReference);
+        }
+        else {
+            bundle[fileName] = {
+                fileName,
+                name: consumedFile.name,
+                needsCodeReference,
+                source,
+                type: 'asset'
+            };
+        }
+    }
+    finalizeAssetsWithSameSource(consumedFiles, sourceHash, { bundle, fileNamesBySource, outputOptions }) {
+        let fileName = '';
+        let usedConsumedFile;
+        let needsCodeReference = true;
+        for (const consumedFile of consumedFiles) {
+            needsCodeReference && (needsCodeReference = consumedFile.needsCodeReference);
+            const assetFileName = generateAssetFileName(consumedFile.name, consumedFile.source, sourceHash, outputOptions, bundle);
+            if (!fileName ||
+                assetFileName.length < fileName.length ||
+                (assetFileName.length === fileName.length && assetFileName < fileName)) {
+                fileName = assetFileName;
+                usedConsumedFile = consumedFile;
+            }
+        }
+        fileNamesBySource.set(sourceHash, fileName);
+        for (const consumedFile of consumedFiles) {
+            // We must not modify the original assets to avoid interaction between outputs
+            const assetWithFileName = { ...consumedFile, fileName };
+            this.filesByReferenceId.set(consumedFile.referenceId, assetWithFileName);
+        }
         bundle[fileName] = {
             fileName,
-            name: consumedFile.name,
-            needsCodeReference: consumedFile.needsCodeReference,
-            source,
+            name: usedConsumedFile.name,
+            needsCodeReference,
+            source: usedConsumedFile.source,
             type: 'asset'
         };
     }

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch-proxy.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.0
-	Mon, 20 Mar 2023 06:08:57 GMT - commit eb9777c1a8a9923951037294b56ceccb1921a5c0
+	Rollup.js v3.20.2
+	Fri, 24 Mar 2023 06:17:57 GMT - commit 1517d0360d66893d5cacdbaf7bc9d841c1c38069
 
 	https://github.com/rollup/rollup
 

package/package.json

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