Fix T2929, T6796, stop leaking directives

packages/babel-plugin-transform-es2015-modules-amd/src/index.js

@@ -1,9 +1,13 @@
 import template from "babel-template";
 
 let buildDefine = template(`
-  define(MODULE_NAME, [SOURCES], function (PARAMS) {
+  define(MODULE_NAME, [SOURCES], FACTORY);
+`);
+
+let buildFactory = template(`
+  (function (PARAMS) {
     BODY;
-  });
+  })
 `);
 
 export default function ({ types: t }) {
@@ -96,11 +100,18 @@ export default function ({ types: t }) {
             params.unshift(t.identifier("module"));
           }
 
-          path.node.body = [buildDefine({
+          let { node } = path;
+          let factory = buildFactory({
+            PARAMS: params,
+            BODY: node.body
+          });
+          factory.expression.body.directives = node.directives;
+          node.directives = [];
+
+          node.body = [buildDefine({
             MODULE_NAME: moduleName,
             SOURCES: sources,
-            PARAMS: params,
+            FACTORY: factory
-            BODY: path.node.body
           })];
         }
       }

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/export-specifier-default/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-from/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-named/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-variable/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/get-module-name-option/expected.js

@@ -1,3 +1 @@
-"use strict";
-
 define("my custom module name", [], function () {});

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "./evens"], function (exports, _evens) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-default/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["foo"], function (_foo) {
+  "use strict";
+
   var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   _foo2.default;

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-glob/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["foo"], function (_foo) {
+  "use strict";
+
   var foo = babelHelpers.interopRequireWildcard(_foo);
   foo;
 });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-mixing/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["foo"], function (_foo) {
+  "use strict";
+
   var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   _foo2.default;

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-named/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["foo"], function (_foo) {
+  "use strict";
+
   _foo.bar;
   _foo.bar2;
   _foo.baz;

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports/expected.js

@@ -1,3 +1 @@
-"use strict";
-
 define(["foo", "foo-bar", "./directory/foo-bar"], function () {});

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/module-name/expected.js

@@ -1,5 +1,5 @@
-"use strict";
-
 define("amd/module-name/expected", [], function () {
+  "use strict";
+
   foobar();
 });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/overview/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/remap/expected.js

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-from/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-named/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-variable/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/get-module-name-option/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define("my custom module name", [], factory);

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "./evens"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports, _evens) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-default/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["foo"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (_foo) {
+  "use strict";
+
   var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   _foo2.default;

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-glob/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["foo"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (_foo) {
+  "use strict";
+
   var foo = babelHelpers.interopRequireWildcard(_foo);
   foo;
 });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-mixing/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["foo"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (_foo) {
+  "use strict";
+
   var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   _foo.baz;

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-named/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["foo"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (_foo) {
+  "use strict";
+
   _foo.bar;
   _foo.bar2;
   _foo.baz;

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["foo", "foo-bar", "./directory/foo-bar"], factory);

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/module-id/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define("MyLib", [], factory);
@@ -13,5 +11,7 @@
     global.MyLib = mod.exports;
   }
 })(this, function () {
+  "use strict";
+
   foobar();
 });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/module-name/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define("umd/module-name/expected", [], factory);
@@ -13,5 +11,7 @@
     global.umdModuleNameExpected = mod.exports;
   }
 })(this, function () {
+  "use strict";
+
   foobar();
 });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/non-default-imports/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["./lib/render"], factory);

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/overview/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports, _foo) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });

packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/remap/expected.js

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -13,6 +11,8 @@
     global.actual = mod.exports;
   }
 })(this, function (exports) {
+  "use strict";
+
   Object.defineProperty(exports, "__esModule", {
     value: true
   });