rollup 2.38.3 → 2.38.4

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup
@@ -19,7 +19,7 @@ function _interopNamespaceDefaultOnly(e) {
   return {__proto__: null, 'default': e};
 }
 
-var version = "2.38.3";
+var version = "2.38.4";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -2765,7 +2765,7 @@ class NodeBase {
             }
         }
     }
-    includeAllDeclaredVariables(context, includeChildrenRecursively) {
+    includeAsSingleStatement(context, includeChildrenRecursively) {
         this.include(context, includeChildrenRecursively);
     }
     includeCallArguments(context, args) {
@@ -7176,7 +7176,7 @@ class DoWhileStatement extends NodeBase {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively);
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
 }
@@ -7250,11 +7250,11 @@ class ForInStatement extends NodeBase {
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
-        this.left.includeAllDeclaredVariables(context, includeChildrenRecursively);
+        this.left.include(context, includeChildrenRecursively || true);
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively);
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
     render(code, options) {
@@ -7284,11 +7284,11 @@ class ForOfStatement extends NodeBase {
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
-        this.left.includeAllDeclaredVariables(context, includeChildrenRecursively);
+        this.left.include(context, includeChildrenRecursively || true);
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively);
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
     render(code, options) {
@@ -7324,13 +7324,13 @@ class ForStatement extends NodeBase {
     include(context, includeChildrenRecursively) {
         this.included = true;
         if (this.init)
-            this.init.includeAllDeclaredVariables(context, includeChildrenRecursively);
+            this.init.includeAsSingleStatement(context, includeChildrenRecursively);
         if (this.test)
             this.test.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
         if (this.update)
             this.update.include(context, includeChildrenRecursively);
-        this.body.include(context, includeChildrenRecursively);
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
     render(code, options) {
@@ -7471,10 +7471,10 @@ class IfStatement extends NodeBase {
             this.test.include(context, false);
         }
         if (testValue && this.consequent.shouldBeIncluded(context)) {
-            this.consequent.include(context, false);
+            this.consequent.includeAsSingleStatement(context, false);
         }
         if (this.alternate !== null && !testValue && this.alternate.shouldBeIncluded(context)) {
-            this.alternate.include(context, false);
+            this.alternate.includeAsSingleStatement(context, false);
         }
     }
     includeRecursively(includeChildrenRecursively, context) {
@@ -7489,12 +7489,12 @@ class IfStatement extends NodeBase {
         const { brokenFlow } = context;
         let consequentBrokenFlow = BROKEN_FLOW_NONE;
         if (this.consequent.shouldBeIncluded(context)) {
-            this.consequent.include(context, false);
+            this.consequent.includeAsSingleStatement(context, false);
             consequentBrokenFlow = context.brokenFlow;
             context.brokenFlow = brokenFlow;
         }
         if (this.alternate !== null && this.alternate.shouldBeIncluded(context)) {
-            this.alternate.include(context, false);
+            this.alternate.includeAsSingleStatement(context, false);
             context.brokenFlow =
                 context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
         }
@@ -9010,11 +9010,13 @@ class VariableDeclaration extends NodeBase {
                 declarator.include(context, includeChildrenRecursively);
         }
     }
-    includeAllDeclaredVariables(context, includeChildrenRecursively) {
+    includeAsSingleStatement(context, includeChildrenRecursively) {
         this.included = true;
         for (const declarator of this.declarations) {
-            declarator.id.included = true;
-            declarator.includeAllDeclaredVariables(context, includeChildrenRecursively);
+            if (includeChildrenRecursively || declarator.shouldBeIncluded(context)) {
+                declarator.include(context, includeChildrenRecursively);
+                declarator.id.include(context, includeChildrenRecursively);
+            }
         }
     }
     initialise() {
@@ -9023,8 +9025,7 @@ class VariableDeclaration extends NodeBase {
         }
     }
     render(code, options, nodeRenderOptions = BLANK) {
-        if (nodeRenderOptions.isNoStatement ||
-            areAllDeclarationsIncludedAndNotExported(this.declarations, options.exportNamesByVariable)) {
+        if (areAllDeclarationsIncludedAndNotExported(this.declarations, options.exportNamesByVariable)) {
             for (const declarator of this.declarations) {
                 declarator.render(code, options);
             }
@@ -9037,11 +9038,13 @@ class VariableDeclaration extends NodeBase {
             this.renderReplacedDeclarations(code, options, nodeRenderOptions);
         }
     }
-    renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, systemPatternExports, options) {
+    renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, systemPatternExports, options, isNoStatement) {
         if (code.original.charCodeAt(this.end - 1) === 59 /*";"*/) {
             code.remove(this.end - 1, this.end);
         }
-        separatorString += ';';
+        if (!isNoStatement) {
+            separatorString += ';';
+        }
         if (lastSeparatorPos !== null) {
             if (code.original.charCodeAt(actualContentEnd - 1) === 10 /*"\n"*/ &&
                 (code.original.charCodeAt(this.end) === 10 /*"\n"*/ ||
@@ -9066,7 +9069,7 @@ class VariableDeclaration extends NodeBase {
             code.appendLeft(renderedContentEnd, ` ${getSystemExportStatement(systemPatternExports, options)};`);
         }
     }
-    renderReplacedDeclarations(code, options, { start = this.start, end = this.end }) {
+    renderReplacedDeclarations(code, options, { start = this.start, end = this.end, isNoStatement }) {
         const separatedNodes = getCommaSeparatedNodesWithBoundaries(this.declarations, code, this.start + this.kind.length, this.end - (code.original.charCodeAt(this.end - 1) === 59 /*";"*/ ? 1 : 0));
         let actualContentEnd, renderedContentEnd;
         renderedContentEnd = findNonWhiteSpace(code.original, this.start + this.kind.length);
@@ -9137,7 +9140,7 @@ class VariableDeclaration extends NodeBase {
             separatorString = nextSeparatorString;
         }
         if (hasRenderedContent) {
-            this.renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, systemPatternExports, options);
+            this.renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, systemPatternExports, options, isNoStatement);
         }
         else {
             code.remove(start, end);
@@ -9164,13 +9167,6 @@ class VariableDeclarator extends NodeBase {
             this.init.include(context, includeChildrenRecursively);
         }
     }
-    includeAllDeclaredVariables(context, includeChildrenRecursively) {
-        this.included = true;
-        this.id.include(context, includeChildrenRecursively);
-        if (this.init) {
-            this.init.include(context, includeChildrenRecursively);
-        }
-    }
     render(code, options) {
         const renderId = this.id.included;
         if (renderId) {
@@ -9204,7 +9200,7 @@ class WhileStatement extends NodeBase {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively);
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
 }

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.38.3
-	Mon, 01 Feb 2021 06:15:21 GMT - commit 683cf48a5278987f08ff3958074c49a80b1ae3eb
+	Rollup.js v2.38.4
+	Tue, 02 Feb 2021 05:54:38 GMT - commit 991bb98fad1f3f76226bfe6243fd6cc45a19a39b
 
 
 	https://github.com/rollup/rollup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.38.3",
+  "version": "2.38.4",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -24,8 +24,7 @@
     "perf": "npm run build:cjs && node --expose-gc scripts/perf.js",
     "perf:debug": "node --inspect-brk scripts/perf-debug.js",
     "perf:init": "node scripts/perf-init.js",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm ci && npm run lint:nofix && npm run security && npm run build:bootstrap && npm run test:all",
+    "prepare": "npm run build:cjs && npm run build:bootstrap",
     "security": "npm audit",
     "test": "npm run build && npm run test:all",
     "test:cjs": "npm run build:cjs && npm run test:only",