Merge branch 'master' of github.com:6to5/6to5

lib/babel/helpers/clone.js

@@ -1,12 +0,0 @@
-"use strict";
-
-module.exports = function cloneDeep(obj) {
-  var obj2 = {};
-  if (!obj) return obj2;
-
-  for (var key in obj) {
-    obj2[key] = obj[key];
-  }
-
-  return obj2;
-};

lib/babel/transformation/file.js

@@ -2,15 +2,14 @@
 
 module.exports = File;
 
-var SHEBANG_REGEX = /^\#\!.*/;
-
 var sourceMapToComment = require("source-map-to-comment");
+var shebangRegex       = require("shebang-regex");
 var isFunction         = require("lodash/lang/isFunction");
 var transform          = require("./index");
 var generate           = require("../generation");
 var defaults           = require("lodash/object/defaults");
 var includes           = require("lodash/collection/includes");
-var clone              = require("../helpers/clone");
+var assign             = require("lodash/object/assign");
 var parse              = require("../helpers/parse");
 var Scope              = require("../traversal/scope");
 var slash              = require("slash");
@@ -98,7 +97,7 @@ File.validOptions = [
 ];
 
 File.prototype.normalizeOptions = function (opts) {
-  opts = clone(opts);
+  opts = assign({}, opts);
 
   for (var key in opts) {
     if (key[0] !== "_" && File.validOptions.indexOf(key) < 0) {
@@ -247,12 +246,13 @@ File.prototype.getModuleFormatter = function (type) {
 };
 
 File.prototype.parseShebang = function (code) {
-  var shebangMatch = code.match(SHEBANG_REGEX);
+  var shebangMatch = shebangRegex.exec(code);
+
   if (shebangMatch) {
     this.shebang = shebangMatch[0];
 
     // remove shebang
-    code = code.replace(SHEBANG_REGEX, "");
+    code = code.replace(shebangRegex, "");
   }
 
   return code;

lib/babel/transformation/transformer.js

@@ -6,7 +6,7 @@ var TransformerPass = require("./transformer-pass");
 var isFunction      = require("lodash/lang/isFunction");
 var traverse        = require("../traversal");
 var isObject        = require("lodash/lang/isObject");
-var clone           = require("../helpers/clone");
+var assign          = require("lodash/object/assign");
 var each            = require("lodash/collection/each");
 
 /**
@@ -16,7 +16,7 @@ var each            = require("lodash/collection/each");
  */
 
 function Transformer(key, transformer, opts) {
-  transformer = clone(transformer);
+  transformer = assign({}, transformer);
 
   var take = function (key) {
     var val = transformer[key];

package.json

@@ -60,6 +60,7 @@
     "regenerator-babel": "0.8.10-2",
     "regexpu": "^1.1.1",
     "repeating": "^1.1.2",
+    "shebang-regex": "^1.0.0",
     "slash": "^1.0.0",
     "source-map": "^0.1.43",
     "source-map-support": "^0.2.9",