Merge branch 'master' into commonjs-strict-requires-true

rollup · Sep 23, 2024 · 175e98f · 175e98f
2 parents e2d74c0 + 1e73857
commit 175e98f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/packages/commonjs/CHANGELOG.md b/packages/commonjs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v26.0.2
+
+_2024-09-23_
+
+### Bugfixes
+
+- fix: replace top-level this with exports name (#1618)
+
 ## v26.0.1
 
 _2024-06-05_

diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "26.0.1",
+  "version": "26.0.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js
@@ -102,6 +102,7 @@ export default async function transformCommonjs(
   const topLevelAssignments = new Set();
   const topLevelDefineCompiledEsmExpressions = [];
   const replacedGlobal = [];
+  const replacedThis = [];
   const replacedDynamicRequires = [];
   const importedVariables = new Set();
   const indentExclusionRanges = [];
@@ -369,7 +370,7 @@ export default async function transformCommonjs(
           if (lexicalDepth === 0 && !classBodyDepth) {
             uses.global = true;
             if (!ignoreGlobal) {
-              replacedGlobal.push(node);
+              replacedThis.push(node);
             }
           }
           return;
@@ -444,6 +445,11 @@ export default async function transformCommonjs(
       storeName: true
     });
   }
+  for (const node of replacedThis) {
+    magicString.overwrite(node.start, node.end, exportsName, {
+      storeName: true
+    });
+  }
   for (const node of replacedDynamicRequires) {
     magicString.overwrite(
       node.start,

diff --git a/packages/commonjs/test/fixtures/function/this/main.js b/packages/commonjs/test/fixtures/function/this/main.js
@@ -1,10 +1,11 @@
-const { augmentThis, classThis } = require('./foo');
+const { augmentThis, classThis, y } = require('./foo');
 
 const obj = {};
 augmentThis.call(obj);
 
 t.is(obj.x, 'x');
-t.is(this.y, 'y');
+t.is(this.y, undefined);
+t.is(y, 'y');
 
 const instance = new classThis();
 

diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md
@@ -9230,8 +9230,6 @@ Generated by [AVA](https://avajs.dev).
     {
       'main.js': `'use strict';␊
       ␊
-      var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊
-      ␊
       function getDefaultExportFromCjs (x) {␊
       	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
       }␊
@@ -9249,7 +9247,7 @@ Generated by [AVA](https://avajs.dev).
       	  this.x = 'x';␊
       	};␊
       ␊
-      	commonjsGlobal.y = 'y';␊
+      	foo.y = 'y';␊
       ␊
       	foo.classThis = class classThis {␊
       	  constructor(){␊
@@ -9270,13 +9268,14 @@ Generated by [AVA](https://avajs.dev).
       function requireMain () {␊
       	if (hasRequiredMain) return main$1;␊
       	hasRequiredMain = 1;␊
-      	const { augmentThis, classThis } = requireFoo();␊
+      	const { augmentThis, classThis, y } = requireFoo();␊
       ␊
       	const obj = {};␊
       	augmentThis.call(obj);␊
       ␊
       	t.is(obj.x, 'x');␊
-      	t.is(commonjsGlobal.y, 'y');␊
+      	t.is(main$1.y, undefined);␊
+      	t.is(y, 'y');␊
       ␊
       	const instance = new classThis();␊
       ␊

diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap
diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap