rollup 3.15.1-0 → 3.16.0

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	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.15.1-0";
+var version$1 = "3.16.0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -370,6 +370,9 @@ class SourceMap {
 		this.sourcesContent = properties.sourcesContent;
 		this.names = properties.names;
 		this.mappings = encode(properties.mappings);
+		if (typeof properties.x_google_ignoreList !== 'undefined') {
+			this.x_google_ignoreList = properties.x_google_ignoreList;
+		}
 	}
 
 	toString() {
@@ -16286,12 +16289,17 @@ function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
  *    following the above rules (a) and (b), starting with the smallest chunks
  *    to look for possible merge targets.
  */
+// TODO instead of picking the "closest" chunk, we could actually use a
+//  technique similar to what we do for side effects to compare the size of the
+//  static dependencies that are not part of the correlated dependencies
 function getOptimizedChunks(chunkModulesBySignature, numberOfEntries, minChunkSize) {
     timeStart('optimize chunks', 3);
     const chunkPartition = getPartitionedChunks(chunkModulesBySignature, numberOfEntries, minChunkSize);
+    console.log('Before eliminating small chunks, there were\n', Object.keys(chunkModulesBySignature).length, 'chunks, of which\n', chunkPartition.small.size, 'were below minChunkSize.');
     if (chunkPartition.small.size > 0) {
         mergeChunks(chunkPartition, minChunkSize);
     }
+    console.log('After merging chunks,\n', chunkPartition.small.size + chunkPartition.big.size, 'chunks remain, of which\n', chunkPartition.small.size, 'are below minChunkSize.');
     timeEnd('optimize chunks', 3);
     return [...chunkPartition.small, ...chunkPartition.big];
 }
@@ -16435,6 +16443,7 @@ function mergeChunks(chunkPartition, minChunkSize) {
                     dependentChunk.dependencies.add(closestChunk);
                 }
                 dependencies.delete(closestChunk);
+                dependentChunks.delete(closestChunk);
                 getChunksInPartition(closestChunk, minChunkSize, chunkPartition).add(closestChunk);
             }
         }
@@ -16850,7 +16859,7 @@ async function transformChunk(magicString, fileName, usedModules, chunkGraph, op
         }
         return result.code;
     });
-    const { compact, dir, file, sourcemap, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform } = options;
+    const { compact, dir, file, sourcemap, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, sourcemapIgnoreList } = options;
     if (!compact && code[code.length - 1] !== '\n')
         code += '\n';
     if (sourcemap) {
@@ -16864,18 +16873,31 @@ async function transformChunk(magicString, fileName, usedModules, chunkGraph, op
             resultingFile = resolve(fileName);
         const decodedMap = magicString.generateDecodedMap({});
         map = collapseSourcemaps(resultingFile, decodedMap, usedModules, sourcemapChain, sourcemapExcludeSources, onwarn);
-        map.sources = map.sources
-            .map(sourcePath => {
+        for (let sourcesIndex = 0; sourcesIndex < map.sources.length; ++sourcesIndex) {
+            let sourcePath = map.sources[sourcesIndex];
+            const sourcemapPath = `${resultingFile}.map`;
+            if (sourcemapIgnoreList) {
+                const ignoreList = sourcemapIgnoreList(sourcePath, sourcemapPath);
+                if (typeof ignoreList !== 'boolean') {
+                    error(errorFailedValidation('sourcemapIgnoreList function must return a boolean.'));
+                }
+                if (ignoreList) {
+                    if (map.x_google_ignoreList === undefined) {
+                        map.x_google_ignoreList = [];
+                    }
+                    if (!map.x_google_ignoreList.includes(sourcesIndex)) {
+                        map.x_google_ignoreList.push(sourcesIndex);
+                    }
+                }
+            }
             if (sourcemapPathTransform) {
-                const newSourcePath = sourcemapPathTransform(sourcePath, `${resultingFile}.map`);
-                if (typeof newSourcePath !== 'string') {
+                sourcePath = sourcemapPathTransform(sourcePath, sourcemapPath);
+                if (typeof sourcePath !== 'string') {
                     error(errorFailedValidation(`sourcemapPathTransform function must return a string.`));
                 }
-                return newSourcePath;
             }
-            return sourcePath;
-        })
-            .map(normalize);
+            map.sources[sourcesIndex] = normalize(sourcePath);
+        }
         timeEnd('sourcemaps', 3);
     }
     return {
@@ -24242,7 +24264,8 @@ class Graph {
         }
     }
     includeStatements() {
-        for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
+        const entryModules = [...this.entryModules, ...this.implicitEntryModules];
+        for (const module of entryModules) {
             markModuleAndImpureDependenciesAsExecuted(module);
         }
         if (this.options.treeshake) {
@@ -24263,7 +24286,7 @@ class Graph {
                 if (treeshakingPass === 1) {
                     // We only include exports after the first pass to avoid issues with
                     // the TDZ detection logic
-                    for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
+                    for (const module of entryModules) {
                         if (module.preserveSignature !== false) {
                             module.includeAllExports(false);
                             this.needsTreeshakingPass = true;
@@ -24751,7 +24774,9 @@ const getAcornInjectPlugins = (config) => [
     importAssertions,
     ...ensureArray(config.acornInjectPlugins)
 ];
-const getCache = (config) => config.cache?.cache || config.cache;
+const getCache = (config) => config.cache === true // `true` is the default
+    ? undefined
+    : config.cache?.cache || config.cache;
 const getIdMatcher = (option) => {
     if (option === true) {
         return () => true;
@@ -24935,6 +24960,7 @@ async function normalizeOutputOptions(config, inputOptions, unsetInputOptions) {
         sourcemapBaseUrl: getSourcemapBaseUrl(config),
         sourcemapExcludeSources: config.sourcemapExcludeSources || false,
         sourcemapFile: config.sourcemapFile,
+        sourcemapIgnoreList: config.sourcemapIgnoreList,
         sourcemapPathTransform: config.sourcemapPathTransform,
         strict: config.strict ?? true,
         systemNullSetters: config.systemNullSetters ?? true,
@@ -25488,7 +25514,7 @@ async function mergeOptions(config, rawCommandOptions = EMPTY_COMMAND_OPTIONS, d
     const outputOptions = await Promise.all(outputOptionsArray.map(singleOutputOptions => mergeOutputOptions(singleOutputOptions, command, warn)));
     warnUnknownOptions(command, [
         ...Object.keys(inputOptions),
-        ...Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'),
+        ...Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapIgnoreList' && option !== 'sourcemapPathTransform'),
         ...Object.keys(commandAliases),
         'bundleConfigAsCjs',
         'config',
@@ -25623,6 +25649,7 @@ async function mergeOutputOptions(config, overrides, warn) {
         sourcemapBaseUrl: getOption('sourcemapBaseUrl'),
         sourcemapExcludeSources: getOption('sourcemapExcludeSources'),
         sourcemapFile: getOption('sourcemapFile'),
+        sourcemapIgnoreList: getOption('sourcemapIgnoreList'),
         sourcemapPathTransform: getOption('sourcemapPathTransform'),
         strict: getOption('strict'),
         systemNullSetters: getOption('systemNullSetters'),

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.d.ts

@@ -52,8 +52,9 @@ export interface ExistingDecodedSourceMap {
 	names: string[];
 	sourceRoot?: string;
 	sources: string[];
-	sourcesContent?: string[];
+	sourcesContent?: (string | null)[];
 	version: number;
+	x_google_ignoreList?: number[];
 }
 
 export interface ExistingRawSourceMap {
@@ -62,8 +63,9 @@ export interface ExistingRawSourceMap {
 	names: string[];
 	sourceRoot?: string;
 	sources: string[];
-	sourcesContent?: string[];
+	sourcesContent?: (string | null)[];
 	version: number;
+	x_google_ignoreList?: number[];
 }
 
 export type DecodedSourceMapOrMissing =
@@ -79,7 +81,7 @@ export interface SourceMap {
 	mappings: string;
 	names: string[];
 	sources: string[];
-	sourcesContent: string[];
+	sourcesContent: (string | null)[];
 	version: number;
 	toString(): string;
 	toUrl(): string;
@@ -507,13 +509,17 @@ export type SourcemapPathTransformOption = (
 	relativeSourcePath: string,
 	sourcemapPath: string
 ) => string;
+export type SourcemapIgnoreListOption = (
+	relativeSourcePath: string,
+	sourcemapPath: string
+) => boolean;
 
 export type InputPluginOption = MaybePromise<Plugin | NullValue | false | InputPluginOption[]>;
 
 export interface InputOptions {
 	acorn?: Record<string, unknown>;
 	acornInjectPlugins?: (() => unknown)[] | (() => unknown);
-	cache?: false | RollupCache;
+	cache?: boolean | RollupCache;
 	context?: string;
 	experimentalCacheExpiry?: number;
 	external?: ExternalOption;
@@ -683,6 +689,7 @@ export interface OutputOptions {
 	sourcemapBaseUrl?: string;
 	sourcemapExcludeSources?: boolean;
 	sourcemapFile?: string;
+	sourcemapIgnoreList?: SourcemapIgnoreListOption;
 	sourcemapPathTransform?: SourcemapPathTransformOption;
 	strict?: boolean;
 	systemNullSetters?: boolean;
@@ -736,6 +743,7 @@ export interface NormalizedOutputOptions {
 	sourcemapBaseUrl: string | undefined;
 	sourcemapExcludeSources: boolean;
 	sourcemapFile: string | undefined;
+	sourcemapIgnoreList: SourcemapIgnoreListOption | undefined;
 	sourcemapPathTransform: SourcemapPathTransformOption | undefined;
 	strict: boolean;
 	systemNullSetters: boolean;

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.15.1-0";
+var version$1 = "3.16.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -973,7 +973,7 @@ async function mergeOptions(config, rawCommandOptions = EMPTY_COMMAND_OPTIONS, d
     const outputOptions = await Promise.all(outputOptionsArray.map(singleOutputOptions => mergeOutputOptions(singleOutputOptions, command, warn)));
     warnUnknownOptions(command, [
         ...Object.keys(inputOptions),
-        ...Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'),
+        ...Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapIgnoreList' && option !== 'sourcemapPathTransform'),
         ...Object.keys(commandAliases),
         'bundleConfigAsCjs',
         'config',
@@ -1114,6 +1114,7 @@ async function mergeOutputOptions(config, overrides, warn) {
         sourcemapBaseUrl: getOption('sourcemapBaseUrl'),
         sourcemapExcludeSources: getOption('sourcemapExcludeSources'),
         sourcemapFile: getOption('sourcemapFile'),
+        sourcemapIgnoreList: getOption('sourcemapIgnoreList'),
         sourcemapPathTransform: getOption('sourcemapPathTransform'),
         strict: getOption('strict'),
         systemNullSetters: getOption('systemNullSetters'),
@@ -1641,6 +1642,9 @@ class SourceMap {
 		this.sourcesContent = properties.sourcesContent;
 		this.names = properties.names;
 		this.mappings = encode(properties.mappings);
+		if (typeof properties.x_google_ignoreList !== 'undefined') {
+			this.x_google_ignoreList = properties.x_google_ignoreList;
+		}
 	}
 
 	toString() {
@@ -16805,12 +16809,17 @@ function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
  *    following the above rules (a) and (b), starting with the smallest chunks
  *    to look for possible merge targets.
  */
+// TODO instead of picking the "closest" chunk, we could actually use a
+//  technique similar to what we do for side effects to compare the size of the
+//  static dependencies that are not part of the correlated dependencies
 function getOptimizedChunks(chunkModulesBySignature, numberOfEntries, minChunkSize) {
     timeStart('optimize chunks', 3);
     const chunkPartition = getPartitionedChunks(chunkModulesBySignature, numberOfEntries, minChunkSize);
+    console.log('Before eliminating small chunks, there were\n', Object.keys(chunkModulesBySignature).length, 'chunks, of which\n', chunkPartition.small.size, 'were below minChunkSize.');
     if (chunkPartition.small.size > 0) {
         mergeChunks(chunkPartition, minChunkSize);
     }
+    console.log('After merging chunks,\n', chunkPartition.small.size + chunkPartition.big.size, 'chunks remain, of which\n', chunkPartition.small.size, 'are below minChunkSize.');
     timeEnd('optimize chunks', 3);
     return [...chunkPartition.small, ...chunkPartition.big];
 }
@@ -16954,6 +16963,7 @@ function mergeChunks(chunkPartition, minChunkSize) {
                     dependentChunk.dependencies.add(closestChunk);
                 }
                 dependencies.delete(closestChunk);
+                dependentChunks.delete(closestChunk);
                 getChunksInPartition(closestChunk, minChunkSize, chunkPartition).add(closestChunk);
             }
         }
@@ -17369,7 +17379,7 @@ async function transformChunk(magicString, fileName, usedModules, chunkGraph, op
         }
         return result.code;
     });
-    const { compact, dir, file, sourcemap, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform } = options;
+    const { compact, dir, file, sourcemap, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, sourcemapIgnoreList } = options;
     if (!compact && code[code.length - 1] !== '\n')
         code += '\n';
     if (sourcemap) {
@@ -17383,18 +17393,31 @@ async function transformChunk(magicString, fileName, usedModules, chunkGraph, op
             resultingFile = node_path.resolve(fileName);
         const decodedMap = magicString.generateDecodedMap({});
         map = collapseSourcemaps(resultingFile, decodedMap, usedModules, sourcemapChain, sourcemapExcludeSources, onwarn);
-        map.sources = map.sources
-            .map(sourcePath => {
+        for (let sourcesIndex = 0; sourcesIndex < map.sources.length; ++sourcesIndex) {
+            let sourcePath = map.sources[sourcesIndex];
+            const sourcemapPath = `${resultingFile}.map`;
+            if (sourcemapIgnoreList) {
+                const ignoreList = sourcemapIgnoreList(sourcePath, sourcemapPath);
+                if (typeof ignoreList !== 'boolean') {
+                    error(errorFailedValidation('sourcemapIgnoreList function must return a boolean.'));
+                }
+                if (ignoreList) {
+                    if (map.x_google_ignoreList === undefined) {
+                        map.x_google_ignoreList = [];
+                    }
+                    if (!map.x_google_ignoreList.includes(sourcesIndex)) {
+                        map.x_google_ignoreList.push(sourcesIndex);
+                    }
+                }
+            }
             if (sourcemapPathTransform) {
-                const newSourcePath = sourcemapPathTransform(sourcePath, `${resultingFile}.map`);
-                if (typeof newSourcePath !== 'string') {
+                sourcePath = sourcemapPathTransform(sourcePath, sourcemapPath);
+                if (typeof sourcePath !== 'string') {
                     error(errorFailedValidation(`sourcemapPathTransform function must return a string.`));
                 }
-                return newSourcePath;
             }
-            return sourcePath;
-        })
-            .map(normalize);
+            map.sources[sourcesIndex] = normalize(sourcePath);
+        }
         timeEnd('sourcemaps', 3);
     }
     return {
@@ -24761,7 +24784,8 @@ class Graph {
         }
     }
     includeStatements() {
-        for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
+        const entryModules = [...this.entryModules, ...this.implicitEntryModules];
+        for (const module of entryModules) {
             markModuleAndImpureDependenciesAsExecuted(module);
         }
         if (this.options.treeshake) {
@@ -24782,7 +24806,7 @@ class Graph {
                 if (treeshakingPass === 1) {
                     // We only include exports after the first pass to avoid issues with
                     // the TDZ detection logic
-                    for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
+                    for (const module of entryModules) {
                         if (module.preserveSignature !== false) {
                             module.includeAllExports(false);
                             this.needsTreeshakingPass = true;
@@ -25174,7 +25198,9 @@ const getAcornInjectPlugins = (config) => [
     importAssertions,
     ...ensureArray$1(config.acornInjectPlugins)
 ];
-const getCache = (config) => config.cache?.cache || config.cache;
+const getCache = (config) => config.cache === true // `true` is the default
+    ? undefined
+    : config.cache?.cache || config.cache;
 const getIdMatcher = (option) => {
     if (option === true) {
         return () => true;
@@ -25358,6 +25384,7 @@ async function normalizeOutputOptions(config, inputOptions, unsetInputOptions) {
         sourcemapBaseUrl: getSourcemapBaseUrl(config),
         sourcemapExcludeSources: config.sourcemapExcludeSources || false,
         sourcemapFile: config.sourcemapFile,
+        sourcemapIgnoreList: config.sourcemapIgnoreList,
         sourcemapPathTransform: config.sourcemapPathTransform,
         strict: config.strict ?? true,
         systemNullSetters: config.systemNullSetters ?? true,

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.15.1-0
-	Mon, 13 Feb 2023 06:03:56 GMT - commit b3866fb81e367d24d78e7aaa93ec0fa794d63fe2
+	Rollup.js v3.16.0
+	Fri, 17 Feb 2023 13:26:29 GMT - commit 8ba73f4f643e5ffe01fc9ad846748f6d5b7963c2
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "3.15.1-0",
+  "version": "3.16.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -116,7 +116,7 @@
     "is-reference": "^3.0.1",
     "lint-staged": "^13.1.0",
     "locate-character": "^2.0.5",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.29.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "pinia": "^2.0.29",