@rollup/plugin-commonjs 22.0.0-13 → 22.0.0-14

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v21.0.3
+
+_2022-03-27_
+
+### Updates
+
+- docs: sync required rollup version (#1118)
+
+## v21.0.2
+
+_2022-02-23_
+
+### Updates
+
+- chore: transpile dynamic helper to ES5 (#1082)
+
 ## v21.0.1
 
 _2021-10-19_

package/dist/cjs/index.js

@@ -16,7 +16,7 @@ var glob__default = /*#__PURE__*/_interopDefaultLegacy(glob);
 var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 var isReference__default = /*#__PURE__*/_interopDefaultLegacy(isReference);
 
-var version = "22.0.0-13";
+var version = "22.0.0-14";
 var peerDependencies = {
 	rollup: "^2.68.0"
 };
@@ -1211,7 +1211,7 @@ function getRequireStringArg(node) {
 function getRequireHandlers() {
   const requireExpressions = [];
 
-  function addRequireStatement(
+  function addRequireExpression(
     sourceId,
     node,
     scope,
@@ -1291,7 +1291,7 @@ function getRequireHandlers() {
   }
 
   return {
-    addRequireStatement,
+    addRequireExpression,
     rewriteRequireExpressionsAndGetImportBlock
   };
 }
@@ -1417,7 +1417,7 @@ async function transformCommonjs(
   // unconditional require elsewhere.
   let currentConditionalNodeEnd = null;
   const conditionalNodes = new Set();
-  const { addRequireStatement, rewriteRequireExpressionsAndGetImportBlock } = getRequireHandlers();
+  const { addRequireExpression, rewriteRequireExpressionsAndGetImportBlock } = getRequireHandlers();
 
   // See which names are assigned to. This is necessary to prevent
   // illegally replacing `var foo = require('foo')` with `import foo from 'foo'`,
@@ -1572,14 +1572,22 @@ async function transformCommonjs(
           const requireStringArg = getRequireStringArg(node);
           if (!ignoreRequire(requireStringArg)) {
             const usesReturnValue = parent.type !== 'ExpressionStatement';
-            addRequireStatement(
+            const toBeRemoved =
+              parent.type === 'ExpressionStatement' &&
+              (!currentConditionalNodeEnd ||
+                // We should completely remove requires directly in a try-catch
+                // so that Rollup can remove up the try-catch
+                (currentTryBlockEnd !== null && currentTryBlockEnd < currentConditionalNodeEnd))
+                ? parent
+                : node;
+            addRequireExpression(
               requireStringArg,
               node,
               scope,
               usesReturnValue,
               currentTryBlockEnd !== null,
               currentConditionalNodeEnd !== null,
-              parent.type === 'ExpressionStatement' ? parent : node
+              toBeRemoved
             );
             if (parent.type === 'VariableDeclarator' && parent.id.type === 'Identifier') {
               for (const name of pluginutils.extractAssignedNames(parent.id)) {
@@ -1781,6 +1789,7 @@ async function transformCommonjs(
     !(
       shouldWrap ||
       isRequired ||
+      needsRequireWrapper ||
       uses.module ||
       uses.exports ||
       uses.require ||