Merge branch 'master' of https://github.com/rollup/rollup into sync-9f5a7355

Author: docschina-bot

CHANGELOG.md

@@ -1,5 +1,21 @@
 # rollup changelog
 
+## 4.21.3
+
+_2024-09-12_
+
+### Bug Fixes
+
+- Always respect side effects in left-hand side of optional chain (#5642)
+- Update stack trace for augmented errors to not hide relevant information (#5640)
+
+### Pull Requests
+
+- [#5636](https://github.com/rollup/rollup/pull/5636): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+- [#5637](https://github.com/rollup/rollup/pull/5637): chore(deps): lock file maintenance (@renovate[bot])
+- [#5640](https://github.com/rollup/rollup/pull/5640): fix: keep the message of stack up-to-date (@TrickyPi)
+- [#5642](https://github.com/rollup/rollup/pull/5642): fix: include left-side effect of optional chaining in the end of hasEffectsAsChainElement (@TrickyPi)
+
 ## 4.21.2
 
 _2024-08-30_

browser/package.json

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

package-lock.json

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

package.json

@@ -106,7 +106,8 @@ export default class CallExpression
 		}
 		return (
 			!this.annotationPure &&
-			this.callee.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.interaction, context)
+			(calleeHasEffects ||
+				this.callee.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.interaction, context))
 		);
 	}
 

src/ast/nodes/CallExpression.ts

@@ -296,7 +296,7 @@ export default class MemberExpression
 		}
 		// We only apply deoptimizations lazily once we know we are not skipping
 		if (!this.deoptimized) this.applyDeoptimizations();
-		return this.property.hasEffects(context) || this.hasAccessEffect(context);
+		return objectHasEffects || this.property.hasEffects(context) || this.hasAccessEffect(context);
 	}
 
 	hasEffectsAsAssignmentTarget(context: HasEffectsContext, checkAccess: boolean): boolean {

src/ast/nodes/MemberExpression.ts

@@ -93,8 +93,9 @@ export function augmentLogMessage(log: AugmentedRollupLog): void {
 		const position = log.loc ? ` (${log.loc.line}:${log.loc.column})` : '';
 		prefix += `${relativeId(id)}${position}: `;
 	}
-
+	const oldMessage = log.message;
 	log.message = prefix + log.message;
+	tweakStackMessage(log, oldMessage);
 }
 
 // Error codes should be sorted alphabetically while errors should be sorted by
@@ -513,34 +514,51 @@ export function logCannotAssignModuleToChunk(
 	};
 }
 
+function tweakStackMessage(error: RollupLog, oldMessage: string): RollupLog {
+	if (!error.stack) {
+		return error;
+	}
+	error.stack = error.stack.replace(oldMessage, error.message);
+	return error;
+}
+
 export function logCannotBundleConfigAsEsm(originalError: Error): RollupLog {
-	return {
-		cause: originalError,
-		code: INVALID_CONFIG_MODULE_FORMAT,
-		message: `Rollup transpiled your configuration to an  ES module even though it appears to contain CommonJS elements. To resolve this, you can pass the "--bundleConfigAsCjs" flag to Rollup or change your configuration to only contain valid ESM code.\n\nOriginal error: ${originalError.message}`,
-		stack: originalError.stack,
-		url: getRollupUrl(URL_BUNDLE_CONFIG_AS_CJS)
-	};
+	return tweakStackMessage(
+		{
+			cause: originalError,
+			code: INVALID_CONFIG_MODULE_FORMAT,
+			message: `Rollup transpiled your configuration to an  ES module even though it appears to contain CommonJS elements. To resolve this, you can pass the "--bundleConfigAsCjs" flag to Rollup or change your configuration to only contain valid ESM code.\n\nOriginal error: ${originalError.message}`,
+			stack: originalError.stack,
+			url: getRollupUrl(URL_BUNDLE_CONFIG_AS_CJS)
+		},
+		originalError.message
+	);
 }
 
 export function logCannotLoadConfigAsCjs(originalError: Error): RollupLog {
-	return {
-		cause: originalError,
-		code: INVALID_CONFIG_MODULE_FORMAT,
-		message: `Node tried to load your configuration file as CommonJS even though it is likely an ES module. To resolve this, change the extension of your configuration to ".mjs", set "type": "module" in your package.json file or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: ${originalError.message}`,
-		stack: originalError.stack,
-		url: getRollupUrl(URL_BUNDLE_CONFIG_AS_CJS)
-	};
+	return tweakStackMessage(
+		{
+			cause: originalError,
+			code: INVALID_CONFIG_MODULE_FORMAT,
+			message: `Node tried to load your configuration file as CommonJS even though it is likely an ES module. To resolve this, change the extension of your configuration to ".mjs", set "type": "module" in your package.json file or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: ${originalError.message}`,
+			stack: originalError.stack,
+			url: getRollupUrl(URL_BUNDLE_CONFIG_AS_CJS)
+		},
+		originalError.message
+	);
 }
 
 export function logCannotLoadConfigAsEsm(originalError: Error): RollupLog {
-	return {
-		cause: originalError,
-		code: INVALID_CONFIG_MODULE_FORMAT,
-		message: `Node tried to load your configuration as an ES module even though it is likely CommonJS. To resolve this, change the extension of your configuration to ".cjs" or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: ${originalError.message}`,
-		stack: originalError.stack,
-		url: getRollupUrl(URL_BUNDLE_CONFIG_AS_CJS)
-	};
+	return tweakStackMessage(
+		{
+			cause: originalError,
+			code: INVALID_CONFIG_MODULE_FORMAT,
+			message: `Node tried to load your configuration as an ES module even though it is likely CommonJS. To resolve this, change the extension of your configuration to ".cjs" or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: ${originalError.message}`,
+			stack: originalError.stack,
+			url: getRollupUrl(URL_BUNDLE_CONFIG_AS_CJS)
+		},
+		originalError.message
+	);
 }
 
 export function logInvalidExportOptionValue(optionValue: string): RollupLog {
@@ -891,13 +909,16 @@ export function logModuleParseError(error: Error, moduleId: string): RollupLog {
 	} else if (!moduleId.endsWith('.js')) {
 		message += ' (Note that you need plugins to import files that are not JavaScript)';
 	}
-	return {
-		cause: error,
-		code: PARSE_ERROR,
-		id: moduleId,
-		message,
-		stack: error.stack
-	};
+	return tweakStackMessage(
+		{
+			cause: error,
+			code: PARSE_ERROR,
+			id: moduleId,
+			message,
+			stack: error.stack
+		},
+		error.message
+	);
 }
 
 export function logPluginError(

src/utils/logs.ts

@@ -8,7 +8,7 @@ module.exports = defineTest({
 	stderr: stderr => {
 		assertIncludes(
 			stderr,
-			'ReferenceError: module is not defined in ES module scope\n' +
+			'Original error: module is not defined in ES module scope\n' +
 				"This file is being treated as an ES module because it has a '.js' file extension and"
 		);
 		assertIncludes(

test/cli/samples/config-type-module/_config.js

@@ -0,0 +1,6 @@
+module.exports = defineTest({
+	description: 'preserve optional chaining with smallest treeshake',
+	options: {
+		treeshake: 'smallest'
+	}
+});

test/form/samples/optional-chaining-with-smallest-treeshake/_config.js

@@ -0,0 +1,2 @@
+while (global[++i]?.key) {} //retained
+while (global(++i)?.key) {} //retained