@rollup/plugin-commonjs 25.0.0 → 25.0.2

package/dist/cjs/index.js

@@ -11,7 +11,7 @@ var estreeWalker = require('estree-walker');
 var MagicString = require('magic-string');
 var isReference = require('is-reference');
 
-var version = "25.0.0";
+var version = "25.0.2";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0"
 };
@@ -1497,6 +1497,7 @@ async function transformCommonjs(
   let scope = pluginutils.attachScopes(ast, 'scope');
   let lexicalDepth = 0;
   let programDepth = 0;
+  let classBodyDepth = 0;
   let currentTryBlockEnd = null;
   let shouldWrap = false;
 
@@ -1679,6 +1680,9 @@ async function transformCommonjs(
           }
           return;
         }
+        case 'ClassBody':
+          classBodyDepth += 1;
+          return;
         case 'ConditionalExpression':
         case 'IfStatement':
           // skip dead branches
@@ -1775,7 +1779,7 @@ async function transformCommonjs(
           return;
         case 'ThisExpression':
           // rewrite top-level `this` as `commonjsHelpers.commonjsGlobal`
-          if (lexicalDepth === 0) {
+          if (lexicalDepth === 0 && !classBodyDepth) {
             uses.global = true;
             if (!ignoreGlobal) {
               replacedGlobal.push(node);
@@ -1826,6 +1830,7 @@ async function transformCommonjs(
       programDepth -= 1;
       if (node.scope) scope = scope.parent;
       if (functionType.test(node.type)) lexicalDepth -= 1;
+      if (node.type === 'ClassBody') classBodyDepth -= 1;
     }
   });
 
@@ -2092,15 +2097,15 @@ function commonjs(options = {}) {
       !isEsModule && (dynamicRequireModules.has(normalizedId) || strictRequiresFilter(id));
 
     const checkDynamicRequire = (position) => {
-      const normalizedRequireRoot = normalizePathSlashes(dynamicRequireRoot);
+      const normalizedDynamicRequireRoot = normalizePathSlashes(dynamicRequireRoot);
 
-      if (normalizedId.indexOf(normalizedRequireRoot) !== 0) {
+      if (normalizedId.indexOf(normalizedDynamicRequireRoot) !== 0) {
         this.error(
           {
             code: 'DYNAMIC_REQUIRE_OUTSIDE_ROOT',
             normalizedId,
-            dynamicRequireRoot,
-            message: `"${normalizedId}" contains dynamic require statements but it is not within the current dynamicRequireRoot "${normalizedRequireRoot}". You should set dynamicRequireRoot to "${path.dirname(
+            normalizedDynamicRequireRoot,
+            message: `"${normalizedId}" contains dynamic require statements but it is not within the current dynamicRequireRoot "${normalizedDynamicRequireRoot}". You should set dynamicRequireRoot to "${path.dirname(
               normalizedId
             )}" or one of its parent directories.`
           },

package/dist/es/index.js

@@ -7,7 +7,7 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import isReference from 'is-reference';
 
-var version = "25.0.0";
+var version = "25.0.2";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0"
 };
@@ -1493,6 +1493,7 @@ async function transformCommonjs(
   let scope = attachScopes(ast, 'scope');
   let lexicalDepth = 0;
   let programDepth = 0;
+  let classBodyDepth = 0;
   let currentTryBlockEnd = null;
   let shouldWrap = false;
 
@@ -1675,6 +1676,9 @@ async function transformCommonjs(
           }
           return;
         }
+        case 'ClassBody':
+          classBodyDepth += 1;
+          return;
         case 'ConditionalExpression':
         case 'IfStatement':
           // skip dead branches
@@ -1771,7 +1775,7 @@ async function transformCommonjs(
           return;
         case 'ThisExpression':
           // rewrite top-level `this` as `commonjsHelpers.commonjsGlobal`
-          if (lexicalDepth === 0) {
+          if (lexicalDepth === 0 && !classBodyDepth) {
             uses.global = true;
             if (!ignoreGlobal) {
               replacedGlobal.push(node);
@@ -1822,6 +1826,7 @@ async function transformCommonjs(
       programDepth -= 1;
       if (node.scope) scope = scope.parent;
       if (functionType.test(node.type)) lexicalDepth -= 1;
+      if (node.type === 'ClassBody') classBodyDepth -= 1;
     }
   });
 
@@ -2088,15 +2093,15 @@ function commonjs(options = {}) {
       !isEsModule && (dynamicRequireModules.has(normalizedId) || strictRequiresFilter(id));
 
     const checkDynamicRequire = (position) => {
-      const normalizedRequireRoot = normalizePathSlashes(dynamicRequireRoot);
+      const normalizedDynamicRequireRoot = normalizePathSlashes(dynamicRequireRoot);
 
-      if (normalizedId.indexOf(normalizedRequireRoot) !== 0) {
+      if (normalizedId.indexOf(normalizedDynamicRequireRoot) !== 0) {
         this.error(
           {
             code: 'DYNAMIC_REQUIRE_OUTSIDE_ROOT',
             normalizedId,
-            dynamicRequireRoot,
-            message: `"${normalizedId}" contains dynamic require statements but it is not within the current dynamicRequireRoot "${normalizedRequireRoot}". You should set dynamicRequireRoot to "${dirname(
+            normalizedDynamicRequireRoot,
+            message: `"${normalizedId}" contains dynamic require statements but it is not within the current dynamicRequireRoot "${normalizedDynamicRequireRoot}". You should set dynamicRequireRoot to "${dirname(
               normalizedId
             )}" or one of its parent directories.`
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "25.0.0",
+  "version": "25.0.2",
   "publishConfig": {
     "access": "public"
   },