Merge branch 'master' of github.com:babel/babel

package.json

@@ -29,7 +29,7 @@
   "dependencies": {
     "ast-types": "~0.7.0",
     "chalk": "^1.0.0",
-    "convert-source-map": "^1.0.0",
+    "convert-source-map": "^1.1.0",
     "core-js": "^0.8.3",
     "debug": "^2.1.1",
     "detect-indent": "^3.0.0",

packages/babel-cli/package.json

@@ -13,7 +13,7 @@
     "fs-readdir-recursive": "^0.1.0",
     "output-file-sync": "^1.1.0",
     "lodash": "^3.2.0",
-    "convert-source-map": "^0.5.0",
+    "convert-source-map": "^1.1.0",
     "source-map": "^0.4.0",
     "path-is-absolute": "^1.0.0"
   },
@@ -22,4 +22,4 @@
     "babel-node": "./bin/babel-node",
     "babel-external-helpers": "./bin/babel-external-helpers"
   }
-}
+}

src/babel/api/register/node.js

@@ -7,6 +7,7 @@ import * as babel from "../node";
 import each from "lodash/collection/each";
 import * as util from  "../../util";
 import fs from "fs";
+import slash from "slash";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -76,6 +77,7 @@ var compile = function (filename) {
 };
 
 var shouldIgnore = function (filename) {
+  filename = slash(filename);
   return (ignoreRegex && ignoreRegex.test(filename)) || (onlyRegex && !onlyRegex.test(filename));
 };
 

src/babel/tools/resolve-rc.js

@@ -17,9 +17,17 @@ function exists(filename) {
 export default function (loc, opts = {}) {
   var rel = ".babelrc";
 
+  if (!opts.babelrc) {
+    opts.babelrc = [];
+  }
+
   function find(start, rel) {
     var file = path.join(start, rel);
 
+    if (opts.babelrc.indexOf(file) >= 0) {
+      return;
+    }
+
     if (exists(file)) {
       var content = fs.readFileSync(file, "utf8");
       var json;
@@ -31,10 +39,18 @@ export default function (loc, opts = {}) {
         throw err;
       }
 
+      opts.babelrc.push(file);
+
       if (json.breakConfig) return;
       merge(opts, json, function(a, b) {
         if (Array.isArray(a)) {
-          return a.concat(b);
+          var c = a.slice(0);
+          for (var v of b) {
+            if (a.indexOf(v) < 0) {
+              c.push(v); 
+            }
+          }
+          return c;
         }
       });
     }
@@ -45,7 +61,7 @@ export default function (loc, opts = {}) {
     }
   }
 
-  if (opts.breakConfig !== true) {
+  if (opts.babelrc.indexOf(loc) < 0 && opts.breakConfig !== true) {
     find(loc, rel);
   }
 

src/babel/transformation/file/options.json

@@ -206,6 +206,11 @@
     "default": false,
     "hidden": true,
     "description": "stop trying to load .babelrc files"
+  },
+
+  "babelrc": {
+    "hidden": true,
+    "description": "do not load the same .babelrc file twice"
   }
 
 }

src/babel/util.js

@@ -18,6 +18,7 @@ import each from "lodash/collection/each";
 import has from "lodash/object/has";
 import fs from "fs";
 import * as t from "./types";
+import slash from "slash";
 
 export { inherits, inspect } from "util";
 
@@ -94,6 +95,7 @@ export function booleanify(val: any): boolean {
 }
 
 export function shouldIgnore(filename, ignore, only) {
+  filename = slash(filename);
   if (only.length) {
     for (var i = 0; i < only.length; i++) {
       if (only[i].test(filename)) return false;

test/core/bin.js

@@ -111,6 +111,7 @@ var buildTest = function (binName, testName, opts) {
 };
 
 var clear = function () {
+  process.chdir(__dirname);
   if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
   fs.mkdirSync(tmpLoc);
   process.chdir(tmpLoc);