From afc3963848beea62520ef140e81a7a4ea4b0bfa0 Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Sat, 7 Oct 2017 21:38:57 -0400
Subject: [PATCH] Clean up template calls.

---
 .../src/for-await.js                                      | 2 +-
 .../babel-plugin-transform-es2015-for-of/src/index.js     | 1 -
 .../src/index.js                                          | 8 --------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/babel-helper-remap-async-to-generator/src/for-await.js b/packages/babel-helper-remap-async-to-generator/src/for-await.js
index e9d1d867a8..815b90525a 100644
--- a/packages/babel-helper-remap-async-to-generator/src/for-await.js
+++ b/packages/babel-helper-remap-async-to-generator/src/for-await.js
@@ -72,7 +72,7 @@ export default function(path, helpers) {
     OBJECT: node.right,
     STEP_VALUE: stepValue,
     STEP_KEY: stepKey,
-    AWAIT: helpers.wrapAwait,
+    ...(helpers.wrapAwait ? { AWAIT: helpers.wrapAwait } : {}),
   });
 
   // remove generator function wrapper
diff --git a/packages/babel-plugin-transform-es2015-for-of/src/index.js b/packages/babel-plugin-transform-es2015-for-of/src/index.js
index b6b1a88bbf..98ee64ce57 100644
--- a/packages/babel-plugin-transform-es2015-for-of/src/index.js
+++ b/packages/babel-plugin-transform-es2015-for-of/src/index.js
@@ -245,7 +245,6 @@ export default function({ template, types: t }, options) {
       ITERATOR_KEY: iteratorKey,
       STEP_KEY: stepKey,
       OBJECT: node.right,
-      BODY: null,
     });
 
     const isLabeledParent = t.isLabeledStatement(parent);
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/src/index.js b/packages/babel-plugin-transform-es2015-modules-amd/src/index.js
index ca53784ea2..8e202a9f47 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/src/index.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/src/index.js
@@ -37,23 +37,16 @@ export default function({ types: t }, options) {
           });
 
           const amdArgs = [];
-          const commonjsArgs = [];
           const importNames = [];
 
           if (hasExports(meta)) {
             amdArgs.push(t.stringLiteral("exports"));
-            commonjsArgs.push(t.identifier("exports"));
 
             importNames.push(t.identifier(meta.exportName));
           }
 
           for (const [source, metadata] of meta.source) {
             amdArgs.push(t.stringLiteral(source));
-            commonjsArgs.push(
-              t.callExpression(t.identifier("require"), [
-                t.stringLiteral(source),
-              ]),
-            );
             importNames.push(t.identifier(metadata.name));
 
             if (!isSideEffectImport(metadata)) {
@@ -89,7 +82,6 @@ export default function({ types: t }, options) {
               MODULE_NAME: moduleName,
 
               AMD_ARGUMENTS: t.arrayExpression(amdArgs),
-              COMMONJS_ARGUMENTS: commonjsArgs,
               IMPORT_NAMES: importNames,
             }),
           ])[0];