From b9e4340700c4a9516db41fbd90561137227ee1ef Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 6 Jan 2015 17:32:00 +1100
Subject: [PATCH] better use strict handling inside of modules

---
 lib/6to5/transformation/modules/system.js                   | 5 +++++
 lib/6to5/transformation/transform.js                        | 2 +-
 .../es6-modules-amd/exports-default/expected.js             | 6 +++---
 .../transformation/es6-modules-amd/exports-from/expected.js | 6 +++---
 .../es6-modules-amd/exports-named/expected.js               | 6 +++---
 .../es6-modules-amd/exports-variable/expected.js            | 6 +++---
 .../es6-modules-amd/hoist-function-exports/expected.js      | 6 +++---
 .../es6-modules-amd/imports-default/expected.js             | 6 +++---
 .../transformation/es6-modules-amd/imports-glob/expected.js | 6 +++---
 .../es6-modules-amd/imports-mixing/expected.js              | 6 +++---
 .../es6-modules-amd/imports-named/expected.js               | 6 +++---
 .../transformation/es6-modules-amd/imports/expected.js      | 6 +++---
 .../transformation/es6-modules-amd/module-name/expected.js  | 6 +++---
 .../transformation/es6-modules-amd/overview/expected.js     | 6 +++---
 .../transformation/es6-modules-amd/remap/expected.js        | 6 +++---
 .../es6-modules-system/exports-default/expected.js          | 6 +++---
 .../es6-modules-system/exports-from/expected.js             | 6 +++---
 .../es6-modules-system/exports-named/expected.js            | 6 +++---
 .../es6-modules-system/exports-variable/expected.js         | 6 +++---
 .../es6-modules-system/hoist-function-exports/expected.js   | 6 +++---
 .../es6-modules-system/imports-default/expected.js          | 6 +++---
 .../es6-modules-system/imports-glob/expected.js             | 6 +++---
 .../es6-modules-system/imports-mixing/expected.js           | 6 +++---
 .../es6-modules-system/imports-named/expected.js            | 6 +++---
 .../transformation/es6-modules-system/imports/expected.js   | 6 +++---
 .../transformation/es6-modules-system/overview/expected.js  | 6 +++---
 .../transformation/es6-modules-system/remap/expected.js     | 6 +++---
 .../es6-modules-umd/exports-default/expected.js             | 6 +++---
 .../transformation/es6-modules-umd/exports-default/untitled | 0
 .../transformation/es6-modules-umd/exports-from/expected.js | 6 +++---
 .../es6-modules-umd/exports-named/expected.js               | 6 +++---
 .../es6-modules-umd/exports-variable/expected.js            | 6 +++---
 .../es6-modules-umd/hoist-function-exports/expected.js      | 6 +++---
 .../es6-modules-umd/imports-default/expected.js             | 6 +++---
 .../transformation/es6-modules-umd/imports-glob/expected.js | 6 +++---
 .../es6-modules-umd/imports-mixing/expected.js              | 6 +++---
 .../es6-modules-umd/imports-named/expected.js               | 6 +++---
 .../transformation/es6-modules-umd/imports/expected.js      | 6 +++---
 .../transformation/es6-modules-umd/module-name/expected.js  | 6 +++---
 .../transformation/es6-modules-umd/overview/expected.js     | 6 +++---
 .../transformation/es6-modules-umd/remap/expected.js        | 6 +++---
 41 files changed, 120 insertions(+), 115 deletions(-)
 create mode 100644 test/fixtures/transformation/es6-modules-umd/exports-default/untitled

diff --git a/lib/6to5/transformation/modules/system.js b/lib/6to5/transformation/modules/system.js
index fe11bcce55..d8a01218e3 100644
--- a/lib/6to5/transformation/modules/system.js
+++ b/lib/6to5/transformation/modules/system.js
@@ -1,6 +1,7 @@
 module.exports = SystemFormatter;
 
 var AMDFormatter = require("./amd");
+var useStrict    = require("../transformers/use-strict");
 var traverse     = require("../../traverse");
 var util         = require("../../util");
 var t            = require("../../types");
@@ -170,5 +171,9 @@ SystemFormatter.prototype.transform = function (ast) {
 
   handlerBody.push(returnStatement);
 
+  if (useStrict._has(block)) {
+    handlerBody.unshift(block.body.shift());
+  }
+
   program.body = [runner];
 };
diff --git a/lib/6to5/transformation/transform.js b/lib/6to5/transformation/transform.js
index e1ad5833d1..981a341d6b 100644
--- a/lib/6to5/transformation/transform.js
+++ b/lib/6to5/transformation/transform.js
@@ -85,9 +85,9 @@ _.each({
   _declarations:             require("./transformers/_declarations"),
 
   // wrap up
+  useStrict:                 require("./transformers/use-strict"),
   _aliasFunctions:           require("./transformers/_alias-functions"),
   _moduleFormatter:          require("./transformers/_module-formatter"),
-  useStrict:                 require("./transformers/use-strict"),
 
   typeofSymbol:              require("./transformers/optional-typeof-symbol"),
   coreAliasing:              require("./transformers/optional-core-aliasing"),
diff --git a/test/fixtures/transformation/es6-modules-amd/exports-default/expected.js b/test/fixtures/transformation/es6-modules-amd/exports-default/expected.js
index 1e004cf1f9..7d36f6bb48 100644
--- a/test/fixtures/transformation/es6-modules-amd/exports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/exports-default/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   exports["default"] = foo;
   exports["default"] = 42;
   exports["default"] = {};
@@ -14,4 +14,4 @@ define(["exports"], function (exports) {
   var Foo = function Foo() {};
 
   exports["default"] = Foo;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js b/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js
index 7faee68424..7d20f967c2 100644
--- a/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -28,4 +28,4 @@ define(["exports", "foo"], function (exports, _foo) {
   exports["default"] = _interopRequire(_foo);
   exports["default"] = _interopRequire(_foo);
   exports.bar = _interopRequire(_foo);
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/exports-named/expected.js b/test/fixtures/transformation/es6-modules-amd/exports-named/expected.js
index b0b1105638..76c505a7ce 100644
--- a/test/fixtures/transformation/es6-modules-amd/exports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/exports-named/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   exports.foo = foo;
   exports.foo = foo;
   exports.bar = bar;
@@ -8,4 +8,4 @@ define(["exports"], function (exports) {
   exports["default"] = foo;
   exports["default"] = foo;
   exports.bar = bar;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/exports-variable/expected.js b/test/fixtures/transformation/es6-modules-amd/exports-variable/expected.js
index fb8d31ad7e..f31d875c89 100644
--- a/test/fixtures/transformation/es6-modules-amd/exports-variable/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/exports-variable/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   exports.foo7 = foo7;
   var foo = exports.foo = 1;
   var foo = exports.foo = 1;
@@ -14,4 +14,4 @@ define(["exports"], function (exports) {
   var foo8 = function foo8() {};
 
   exports.foo8 = foo8;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/hoist-function-exports/expected.js b/test/fixtures/transformation/es6-modules-amd/hoist-function-exports/expected.js
index 666b374c65..5f8f8e9886 100644
--- a/test/fixtures/transformation/es6-modules-amd/hoist-function-exports/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/hoist-function-exports/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "./evens"], function (exports, _evens) {
+  "use strict";
+
   exports.nextOdd = nextOdd;
   var isEven = _evens.isEven;
   function nextOdd(n) {
@@ -12,4 +12,4 @@ define(["exports", "./evens"], function (exports, _evens) {
       return !isEven(n);
     };
   })(isEven);
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js b/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js
index 84f49c3f1f..78a5151d3a 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -8,4 +8,4 @@ define(["exports", "foo"], function (exports, _foo) {
   var foo = _interopRequire(_foo);
 
   var foo = _interopRequire(_foo);
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-amd/imports-glob/expected.js
index 414d126b14..cc03946787 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-glob/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-glob/expected.js
@@ -1,5 +1,5 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   var foo = _foo;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-mixing/expected.js b/test/fixtures/transformation/es6-modules-amd/imports-mixing/expected.js
index 406cfab22b..8acd23bf34 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-mixing/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-mixing/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -8,4 +8,4 @@ define(["exports", "foo"], function (exports, _foo) {
   var foo = _interopRequire(_foo);
 
   var xyz = _foo.baz;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js b/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js
index 8912d46bae..5140508011 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js
@@ -1,10 +1,10 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   var bar = _foo.bar;
   var bar = _foo.bar;
   var baz = _foo.baz;
   var baz = _foo.bar;
   var baz = _foo.bar;
   var xyz = _foo.xyz;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/imports/expected.js b/test/fixtures/transformation/es6-modules-amd/imports/expected.js
index d3f30c8b16..84e1e6dcc7 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports/expected.js
@@ -1,3 +1,3 @@
-"use strict";
-
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {});
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/module-name/expected.js b/test/fixtures/transformation/es6-modules-amd/module-name/expected.js
index 9b7a5fee64..c129a9ffb6 100644
--- a/test/fixtures/transformation/es6-modules-amd/module-name/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/module-name/expected.js
@@ -1,5 +1,5 @@
-"use strict";
-
 define("es6-modules-amd/module-name/expected", ["exports"], function (exports) {
+  "use strict";
+
   foobar();
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/overview/expected.js b/test/fixtures/transformation/es6-modules-amd/overview/expected.js
index 1c755a0fab..a0b839c896 100644
--- a/test/fixtures/transformation/es6-modules-amd/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/overview/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -14,4 +14,4 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports,
   var test = exports.test = 5;
 
   exports["default"] = test;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd/remap/expected.js b/test/fixtures/transformation/es6-modules-amd/remap/expected.js
index 9d30a0f7bd..1edd3204c1 100644
--- a/test/fixtures/transformation/es6-modules-amd/remap/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/remap/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   var test = exports.test = 2;
   test = exports.test = 5;
   test = exports.test += 1;
@@ -10,4 +10,4 @@ define(["exports"], function (exports) {
     test = 3;
     test++;
   })();
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/exports-default/expected.js b/test/fixtures/transformation/es6-modules-system/exports-default/expected.js
index 8761dda421..bf1e155301 100644
--- a/test/fixtures/transformation/es6-modules-system/exports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/exports-default/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register([], function (_export) {
+  "use strict";
+
   var Foo;
   _export("default", foo);
 
@@ -25,4 +25,4 @@ System.register([], function (_export) {
       _export("default", Foo);
     }
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/exports-from/expected.js b/test/fixtures/transformation/es6-modules-system/exports-from/expected.js
index 5c23f2b435..7f9a382a09 100644
--- a/test/fixtures/transformation/es6-modules-system/exports-from/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/exports-from/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["foo"], function (_export) {
+  "use strict";
+
   return {
     setters: [function (_foo) {
       for (var _key in _foo) {
@@ -23,4 +23,4 @@ System.register(["foo"], function (_export) {
     }],
     execute: function () {}
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/exports-named/expected.js b/test/fixtures/transformation/es6-modules-system/exports-named/expected.js
index 2f06c0c7d6..195854646f 100644
--- a/test/fixtures/transformation/es6-modules-system/exports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/exports-named/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register([], function (_export) {
+  "use strict";
+
   return {
     setters: [],
     execute: function () {
@@ -19,4 +19,4 @@ System.register([], function (_export) {
       _export("bar", bar);
     }
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/exports-variable/expected.js b/test/fixtures/transformation/es6-modules-system/exports-variable/expected.js
index 0d8c870385..9c643cfdb6 100644
--- a/test/fixtures/transformation/es6-modules-system/exports-variable/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/exports-variable/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register([], function (_export) {
+  "use strict";
+
   var foo, foo2, foo3, foo4, foo5, foo6, foo8;
   _export("foo7", foo7);
 
@@ -19,4 +19,4 @@ System.register([], function (_export) {
       _export("foo8", foo8);
     }
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/hoist-function-exports/expected.js b/test/fixtures/transformation/es6-modules-system/hoist-function-exports/expected.js
index 53451797b2..a5aae84ee7 100644
--- a/test/fixtures/transformation/es6-modules-system/hoist-function-exports/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/hoist-function-exports/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["./evens"], function (_export) {
+  "use strict";
+
   var isEven, p, isOdd;
   _export("nextOdd", nextOdd);
 
@@ -21,4 +21,4 @@ System.register(["./evens"], function (_export) {
       })(isEven));
     }
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/imports-default/expected.js b/test/fixtures/transformation/es6-modules-system/imports-default/expected.js
index 6398509e9e..8164489973 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-default/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["foo"], function (_export) {
+  "use strict";
+
   var foo, foo;
   return {
     setters: [function (_foo) {
@@ -9,4 +9,4 @@ System.register(["foo"], function (_export) {
     }],
     execute: function () {}
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-system/imports-glob/expected.js
index d2176e441c..6e08c8dcc9 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-glob/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-glob/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["foo"], function (_export) {
+  "use strict";
+
   var foo;
   return {
     setters: [function (_foo) {
@@ -8,4 +8,4 @@ System.register(["foo"], function (_export) {
     }],
     execute: function () {}
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/imports-mixing/expected.js b/test/fixtures/transformation/es6-modules-system/imports-mixing/expected.js
index c3f67fcf72..31b6f179ea 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-mixing/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-mixing/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["foo"], function (_export) {
+  "use strict";
+
   var foo, xyz;
   return {
     setters: [function (_foo) {
@@ -9,4 +9,4 @@ System.register(["foo"], function (_export) {
     }],
     execute: function () {}
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/imports-named/expected.js b/test/fixtures/transformation/es6-modules-system/imports-named/expected.js
index ead590f0a5..848c4a28ba 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-named/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["foo"], function (_export) {
+  "use strict";
+
   var bar, bar, baz, baz, baz, xyz;
   return {
     setters: [function (_foo) {
@@ -13,4 +13,4 @@ System.register(["foo"], function (_export) {
     }],
     execute: function () {}
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/imports/expected.js b/test/fixtures/transformation/es6-modules-system/imports/expected.js
index d976b200ce..595df89e93 100644
--- a/test/fixtures/transformation/es6-modules-system/imports/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports/expected.js
@@ -1,8 +1,8 @@
-"use strict";
-
 System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
+  "use strict";
+
   return {
     setters: [function (_foo) {}, function (_fooBar) {}, function (_directoryFooBar) {}],
     execute: function () {}
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/overview/expected.js b/test/fixtures/transformation/es6-modules-system/overview/expected.js
index e0e40a9fda..59e6c96af2 100644
--- a/test/fixtures/transformation/es6-modules-system/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/overview/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
+  "use strict";
+
   var foo, foo, bar, bar, test;
   return {
     setters: [function (_foo) {
@@ -16,4 +16,4 @@ System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
       _export("default", test);
     }
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-system/remap/expected.js b/test/fixtures/transformation/es6-modules-system/remap/expected.js
index 015a3b3c76..446bdfcc9a 100644
--- a/test/fixtures/transformation/es6-modules-system/remap/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/remap/expected.js
@@ -1,6 +1,6 @@
-"use strict";
-
 System.register([], function (_export) {
+  "use strict";
+
   var test;
   return {
     setters: [],
@@ -16,4 +16,4 @@ System.register([], function (_export) {
       })();
     }
   };
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/exports-default/expected.js b/test/fixtures/transformation/es6-modules-umd/exports-default/expected.js
index 72d833f2fc..4eb8ccf35d 100644
--- a/test/fixtures/transformation/es6-modules-umd/exports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/exports-default/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -7,6 +5,8 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   exports["default"] = foo;
   exports["default"] = 42;
   exports["default"] = {};
@@ -20,4 +20,4 @@
   var Foo = function Foo() {};
 
   exports["default"] = Foo;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/exports-default/untitled b/test/fixtures/transformation/es6-modules-umd/exports-default/untitled
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js b/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js
index 9575b15b17..1878d5a1e1 100644
--- a/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -34,4 +34,4 @@
   exports["default"] = _interopRequire(_foo);
   exports["default"] = _interopRequire(_foo);
   exports.bar = _interopRequire(_foo);
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/exports-named/expected.js b/test/fixtures/transformation/es6-modules-umd/exports-named/expected.js
index ca8dc8d3c5..bb59a54207 100644
--- a/test/fixtures/transformation/es6-modules-umd/exports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/exports-named/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -7,6 +5,8 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   exports.foo = foo;
   exports.foo = foo;
   exports.bar = bar;
@@ -14,4 +14,4 @@
   exports["default"] = foo;
   exports["default"] = foo;
   exports.bar = bar;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/exports-variable/expected.js b/test/fixtures/transformation/es6-modules-umd/exports-variable/expected.js
index 9fa63e55f1..f8011621be 100644
--- a/test/fixtures/transformation/es6-modules-umd/exports-variable/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/exports-variable/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -7,6 +5,8 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   exports.foo7 = foo7;
   var foo = exports.foo = 1;
   var foo = exports.foo = 1;
@@ -20,4 +20,4 @@
   var foo8 = function foo8() {};
 
   exports.foo8 = foo8;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/hoist-function-exports/expected.js b/test/fixtures/transformation/es6-modules-umd/hoist-function-exports/expected.js
index bced4aee50..e2ec28a22c 100644
--- a/test/fixtures/transformation/es6-modules-umd/hoist-function-exports/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/hoist-function-exports/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "./evens"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("./evens"));
   }
 })(function (exports, _evens) {
+  "use strict";
+
   exports.nextOdd = nextOdd;
   var isEven = _evens.isEven;
   function nextOdd(n) {
@@ -18,4 +18,4 @@
       return !isEven(n);
     };
   })(isEven);
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js b/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js
index aecbf9e589..f68f912f15 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -14,4 +14,4 @@
   var foo = _interopRequire(_foo);
 
   var foo = _interopRequire(_foo);
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-umd/imports-glob/expected.js
index 7dc4aeb30a..45a763f2f2 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-glob/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-glob/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,5 +5,7 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var foo = _foo;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-mixing/expected.js b/test/fixtures/transformation/es6-modules-umd/imports-mixing/expected.js
index 6ab5bdd395..f677ceee86 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-mixing/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-mixing/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -14,4 +14,4 @@
   var foo = _interopRequire(_foo);
 
   var xyz = _foo.baz;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js b/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js
index 896105f29c..2d75892bf6 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,10 +5,12 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var bar = _foo.bar;
   var bar = _foo.bar;
   var baz = _foo.baz;
   var baz = _foo.bar;
   var baz = _foo.bar;
   var xyz = _foo.xyz;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/imports/expected.js b/test/fixtures/transformation/es6-modules-umd/imports/expected.js
index abcaf5b99a..2e39b15cd2 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports/expected.js
@@ -1,9 +1,9 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
-})(function (exports, _foo, _fooBar, _directoryFooBar) {});
+})(function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/module-name/expected.js b/test/fixtures/transformation/es6-modules-umd/module-name/expected.js
index 73834cdd3b..aa570b25e3 100644
--- a/test/fixtures/transformation/es6-modules-umd/module-name/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/module-name/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define("es6-modules-umd/module-name/expected", ["exports"], factory);
@@ -7,5 +5,7 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   foobar();
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/overview/expected.js b/test/fixtures/transformation/es6-modules-umd/overview/expected.js
index e3714c727b..c719a30063 100644
--- a/test/fixtures/transformation/es6-modules-umd/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/overview/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
 })(function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -20,4 +20,4 @@
   var test = exports.test = 5;
 
   exports["default"] = test;
-});
+});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd/remap/expected.js b/test/fixtures/transformation/es6-modules-umd/remap/expected.js
index 679d11511f..99e5928e2d 100644
--- a/test/fixtures/transformation/es6-modules-umd/remap/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/remap/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -7,6 +5,8 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   var test = exports.test = 2;
   test = exports.test = 5;
   test = exports.test += 1;
@@ -16,4 +16,4 @@
     test = 3;
     test++;
   })();
-});
+});
\ No newline at end of file