Example usage

babel · Mar 7, 2019 · 0e58e25 · 0e58e25
1 parent 6c9fc60
commit 0e58e25
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/packages/babel-plugin-transform-modules-amd/src/index.js b/packages/babel-plugin-transform-modules-amd/src/index.js
@@ -11,8 +11,11 @@ import {
 import { template, types as t } from "@babel/core";
 
 const buildWrapper = template(`
-  define(MODULE_NAME, AMD_ARGUMENTS, function(IMPORT_NAMES) {
-  })
+  define(
+    %%MODULE_NAME%%,
+    %%AMD_ARGUMENTS%%,
+    function(%%IMPORT_NAMES%%) %%BODY%%
+  )
 `);
 
 export default declare((api, options) => {
@@ -84,20 +87,17 @@ export default declare((api, options) => {
           const { body, directives } = path.node;
           path.node.directives = [];
           path.node.body = [];
-          const amdWrapper = path.pushContainer("body", [
+
+          path.pushContainer("body", [
             buildWrapper({
               MODULE_NAME: moduleName,
 
               AMD_ARGUMENTS: t.arrayExpression(amdArgs),
               IMPORT_NAMES: importNames,
+
+              BODY: t.blockStatement(body, directives),
             }),
-          ])[0];
-          const amdFactory = amdWrapper
-            .get("expression.arguments")
-            .filter(arg => arg.isFunctionExpression())[0]
-            .get("body");
-          amdFactory.pushContainer("directives", directives);
-          amdFactory.pushContainer("body", body);
+          ]);
         },
       },
     },

diff --git a/packages/babel-plugin-transform-modules-umd/src/index.js b/packages/babel-plugin-transform-modules-umd/src/index.js
@@ -18,17 +18,16 @@ const buildPrerequisiteAssignment = template(`
 const buildWrapper = template(`
   (function (global, factory) {
     if (typeof define === "function" && define.amd) {
-      define(MODULE_NAME, AMD_ARGUMENTS, factory);
+      define(%%MODULE_NAME%%, %%AMD_ARGUMENTS%%, factory);
     } else if (typeof exports !== "undefined") {
-      factory(COMMONJS_ARGUMENTS);
+      factory(%%COMMONJS_ARGUMENTS%%);
     } else {
       var mod = { exports: {} };
-      factory(BROWSER_ARGUMENTS);
+      factory(%%BROWSER_ARGUMENTS%%);
 
-      GLOBAL_TO_ASSIGN;
+      %%GLOBAL_TO_ASSIGN%%;
     }
-  })(this, function(IMPORT_NAMES) {
-  })
+  })(this, function(%%IMPORT_NAMES%%) %%BODY%%)
 `);
 
 export default declare((api, options) => {
@@ -204,7 +203,8 @@ export default declare((api, options) => {
           const { body, directives } = path.node;
           path.node.directives = [];
           path.node.body = [];
-          const umdWrapper = path.pushContainer("body", [
+
+          path.pushContainer("body", [
             buildWrapper({
               MODULE_NAME: moduleName,
 
@@ -219,13 +219,10 @@ export default declare((api, options) => {
                 this.filename || "unknown",
                 moduleName,
               ),
+
+              BODY: t.blockStatement(body, directives),
             }),
-          ])[0];
-          const umdFactory = umdWrapper
-            .get("expression.arguments")[1]
-            .get("body");
-          umdFactory.pushContainer("directives", directives);
-          umdFactory.pushContainer("body", body);
+          ]);
         },
       },
     },