Merge branch 'master' into feat/treeshake-dynamic-import

CHANGELOG.md

@@ -1,5 +1,20 @@
 # rollup changelog
 
+## 3.20.7
+
+_2023-04-21_
+
+### Bug Fixes
+
+- Properly track array element mutations when iterating with a for-of loop (#4949)
+- Handle default exporting an anonymous class that extends another class (#4950)
+
+### Pull Requests
+
+- [#4943](https://github.com/rollup/rollup/pull/4943): Add a test for reserved keywords used as import/export specifiers (@Andarist)
+- [#4949](https://github.com/rollup/rollup/pull/4949): Deoptimize right side in for-of loops (@lukastaegert)
+- [#4950](https://github.com/rollup/rollup/pull/4950): Support default exported classes that extend other classes (@lukastaegert)
+
 ## 3.20.6
 
 _2023-04-18_

browser/package.json

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

package.json

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

src/ast/nodes/ExportDefaultDeclaration.ts

@@ -21,18 +21,10 @@ function getDeclarationStart(code: string, start: number): number {
 	return findNonWhiteSpace(code, findFirstOccurrenceOutsideComment(code, 'default', start) + 7);
 }
 
-function getIdInsertPosition(
-	code: string,
-	declarationKeyword: string,
-	endMarker: string,
-	start: number
-): number {
+function getFunctionIdInsertPosition(code: string, start: number): number {
 	const declarationEnd =
-		findFirstOccurrenceOutsideComment(code, declarationKeyword, start) + declarationKeyword.length;
-	code = code.slice(
-		declarationEnd,
-		findFirstOccurrenceOutsideComment(code, endMarker, declarationEnd)
-	);
+		findFirstOccurrenceOutsideComment(code, 'function', start) + 'function'.length;
+	code = code.slice(declarationEnd, findFirstOccurrenceOutsideComment(code, '(', declarationEnd));
 	const generatorStarPos = findFirstOccurrenceOutsideComment(code, '*');
 	if (generatorStarPos === -1) {
 		return declarationEnd;
@@ -76,18 +68,18 @@ export default class ExportDefaultDeclaration extends NodeBase {
 			this.renderNamedDeclaration(
 				code,
 				declarationStart,
-				'function',
-				'(',
-				this.declaration.id === null,
+				this.declaration.id === null
+					? getFunctionIdInsertPosition(code.original, declarationStart)
+					: null,
 				options
 			);
 		} else if (this.declaration instanceof ClassDeclaration) {
 			this.renderNamedDeclaration(
 				code,
 				declarationStart,
-				'class',
-				'{',
-				this.declaration.id === null,
+				this.declaration.id === null
+					? findFirstOccurrenceOutsideComment(code.original, 'class', start) + 'class'.length
+					: null,
 				options
 			);
 		} else if (this.variable.getOriginalVariable() !== this.variable) {
@@ -114,9 +106,7 @@ export default class ExportDefaultDeclaration extends NodeBase {
 	private renderNamedDeclaration(
 		code: MagicString,
 		declarationStart: number,
-		declarationKeyword: string,
-		endMarker: string,
-		needsId: boolean,
+		idInsertPosition: number | null,
 		options: RenderOptions
 	): void {
 		const {
@@ -128,11 +118,8 @@ export default class ExportDefaultDeclaration extends NodeBase {
 		// Remove `export default`
 		code.remove(this.start, declarationStart);
 
-		if (needsId) {
-			code.appendLeft(
-				getIdInsertPosition(code.original, declarationKeyword, endMarker, declarationStart),
-				` ${name}`
-			);
+		if (idInsertPosition !== null) {
+			code.appendLeft(idInsertPosition, ` ${name}`);
 		}
 		if (
 			format === 'system' &&

src/ast/nodes/ForOfStatement.ts

@@ -3,7 +3,7 @@ import { NO_SEMICOLON, type RenderOptions } from '../../utils/renderHelpers';
 import type { InclusionContext } from '../ExecutionContext';
 import BlockScope from '../scopes/BlockScope';
 import type Scope from '../scopes/Scope';
-import { EMPTY_PATH } from '../utils/PathTracker';
+import { EMPTY_PATH, UNKNOWN_PATH } from '../utils/PathTracker';
 import type MemberExpression from './MemberExpression';
 import type * as NodeType from './NodeType';
 import type VariableDeclaration from './VariableDeclaration';
@@ -60,6 +60,7 @@ export default class ForOfStatement extends StatementBase {
 	protected applyDeoptimizations(): void {
 		this.deoptimized = true;
 		this.left.deoptimizePath(EMPTY_PATH);
+		this.right.deoptimizePath(UNKNOWN_PATH);
 		this.context.requestTreeshakingPass();
 	}
 }

test/form/samples/default-export-anonymous-class-extends/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'handles default exported classes extending a regular expression argument (#4783)'
+};

test/form/samples/default-export-anonymous-class-extends/_expected.js

@@ -0,0 +1,7 @@
+function foo(val) {
+	return val;
+}
+
+class main extends foo(/1/) {}
+
+export { main as default };

test/form/samples/default-export-anonymous-class-extends/main.js

@@ -0,0 +1,5 @@
+function foo(val) {
+	return val;
+}
+
+export default class extends foo(/1/) {}

test/function/samples/deoptimize-loop-element/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'deoptimizes the loop element when it is reassigned'
+};

test/function/samples/deoptimize-loop-element/main.js

@@ -0,0 +1,7 @@
+const foo = [{ value: 1 }];
+
+for (const item of foo) {
+	item.value = 0;
+}
+
+assert.ok(foo[0].value === 0 ? true : false);