@rollup/plugin-commonjs 29.0.0 → 29.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 = "29.0.0";
+var version = "29.0.1";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -928,6 +928,20 @@ function validateVersion(actualVersion, peerDependencyVersion, name) {
   }
 }
 
+function triStateAnd(a, b) {
+  if (a === false) return false;
+  if (b === false) return false;
+  if (a === true && b === true) return true;
+  return null;
+}
+
+function triStateOr(a, b) {
+  if (a === true) return true;
+  if (b === true) return true;
+  if (a === false && b === false) return false;
+  return null;
+}
+
 const operators = {
   '==': (x) => equals(x.left, x.right, false),
 
@@ -939,9 +953,9 @@ const operators = {
 
   '!': (x) => isFalsy(x.argument),
 
-  '&&': (x) => isTruthy(x.left) && isTruthy(x.right),
+  '&&': (x) => triStateAnd(isTruthy(x.left), isTruthy(x.right)),
 
-  '||': (x) => isTruthy(x.left) || isTruthy(x.right)
+  '||': (x) => triStateOr(isTruthy(x.left), isTruthy(x.right))
 };
 
 function not(value) {
@@ -1041,6 +1055,10 @@ function isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
+function isPropertyDefinitionKey(parent, node) {
+  return parent && parent.type === 'PropertyDefinition' && parent.key === node;
+}
+
 function wrapCode(magicString, uses, moduleName, exportsName, indentExclusionRanges) {
   const args = [];
   const passedArgs = [];
@@ -1795,7 +1813,7 @@ async function transformCommonjs(
           if (
             !isReference(node, parent) ||
             scope.contains(name) ||
-            (parent.type === 'PropertyDefinition' && parent.key === node)
+            isPropertyDefinitionKey(parent, node)
           )
             return;
           switch (name) {
@@ -1822,6 +1840,10 @@ async function transformCommonjs(
             case 'global':
               uses.global = true;
               if (!ignoreGlobal) {
+                if (isShorthandProperty(parent)) {
+                  skippedNodes.add(parent.value);
+                  magicString.prependRight(node.start, 'global: ');
+                }
                 replacedGlobal.push(node);
               }
               return;
@@ -1942,6 +1964,7 @@ async function transformCommonjs(
 
   for (const node of replacedGlobal) {
     magicString.overwrite(node.start, node.end, `${helpersName}.commonjsGlobal`, {
+      contentOnly: true,
       storeName: true
     });
   }

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 = "29.0.0";
+var version = "29.0.1";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -924,6 +924,20 @@ function validateVersion(actualVersion, peerDependencyVersion, name) {
   }
 }
 
+function triStateAnd(a, b) {
+  if (a === false) return false;
+  if (b === false) return false;
+  if (a === true && b === true) return true;
+  return null;
+}
+
+function triStateOr(a, b) {
+  if (a === true) return true;
+  if (b === true) return true;
+  if (a === false && b === false) return false;
+  return null;
+}
+
 const operators = {
   '==': (x) => equals(x.left, x.right, false),
 
@@ -935,9 +949,9 @@ const operators = {
 
   '!': (x) => isFalsy(x.argument),
 
-  '&&': (x) => isTruthy(x.left) && isTruthy(x.right),
+  '&&': (x) => triStateAnd(isTruthy(x.left), isTruthy(x.right)),
 
-  '||': (x) => isTruthy(x.left) || isTruthy(x.right)
+  '||': (x) => triStateOr(isTruthy(x.left), isTruthy(x.right))
 };
 
 function not(value) {
@@ -1037,6 +1051,10 @@ function isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
+function isPropertyDefinitionKey(parent, node) {
+  return parent && parent.type === 'PropertyDefinition' && parent.key === node;
+}
+
 function wrapCode(magicString, uses, moduleName, exportsName, indentExclusionRanges) {
   const args = [];
   const passedArgs = [];
@@ -1791,7 +1809,7 @@ async function transformCommonjs(
           if (
             !isReference(node, parent) ||
             scope.contains(name) ||
-            (parent.type === 'PropertyDefinition' && parent.key === node)
+            isPropertyDefinitionKey(parent, node)
           )
             return;
           switch (name) {
@@ -1818,6 +1836,10 @@ async function transformCommonjs(
             case 'global':
               uses.global = true;
               if (!ignoreGlobal) {
+                if (isShorthandProperty(parent)) {
+                  skippedNodes.add(parent.value);
+                  magicString.prependRight(node.start, 'global: ');
+                }
                 replacedGlobal.push(node);
               }
               return;
@@ -1938,6 +1960,7 @@ async function transformCommonjs(
 
   for (const node of replacedGlobal) {
     magicString.overwrite(node.start, node.end, `${helpersName}.commonjsGlobal`, {
+      contentOnly: true,
       storeName: true
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "29.0.0",
+  "version": "29.0.2",
   "publishConfig": {
     "access": "public"
   },
@@ -36,7 +36,8 @@
     "npm",
     "modules",
     "commonjs",
-    "require"
+    "require",
+    "rollup-plugin"
   ],
   "peerDependencies": {
     "rollup": "^2.68.0||^3.0.0||^4.0.0"