Merge pull request babel/babel-eslint#215 from zertosh/master

babylon/espree option alignment

eslint/babel-eslint-parser/index.js

@@ -370,12 +370,11 @@ exports.parse = function (code) {
 
 exports.parseNoPatch = function (code) {
   var opts = {
-    locations: true,
-    ranges: true,
     sourceType: "module",
     strictMode: true,
-    allowHashBang: true,
-    ecmaVersion: Infinity,
+    allowImportExportEverywhere: false, // consistent with espree
+    allowReturnOutsideFunction: true,
+    allowSuperOutsideMethod: true,
     plugins: [
         "flow",
         "jsx",
@@ -391,7 +390,7 @@ exports.parseNoPatch = function (code) {
         "objectRestSpread",
         "trailingFunctionCommas"
     ]
-};
+  };
 
   var ast;
   try {

eslint/babel-eslint-parser/test/babel-eslint.js

@@ -388,4 +388,18 @@ describe("acorn-to-esprima", function () {
       "}"
     ].join("\n"));
   });
+
+  it("do not allow import export everywhere", function() {
+    assert.throws(function () {
+      parseAndAssertSame("function F() { import a from \"a\"; }");
+    }, /Illegal import declaration/)
+  });
+
+  it("return outside function", function () {
+    parseAndAssertSame("return;");
+  });
+
+  it("super outside method", function () {
+    parseAndAssertSame("function F() { super(); }");
+  });
 });