v5.6.10

CHANGELOG.md

@@ -13,6 +13,13 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.6.10
+
+ * **Bug Fix**
+  * Fix faulty internal require check.
+ * **Polish**
+  * Add support for trailing commas in arrow function parameter lists.
+
 ## 5.6.8
 
  * **Bug Fix**

index.js

@@ -0,0 +1 @@
+module.exports = require("./lib/babel/api/node.js");

package.json

@@ -1,12 +1,11 @@
 {
   "name": "babel-core",
   "description": "A compiler for writing next generation JavaScript",
-  "version": "5.6.8",
+  "version": "5.6.10",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
   "repository": "babel/babel",
-  "main": "lib/babel/api/node.js",
   "browser": {
     "./lib/babel/api/register/node.js": "./lib/babel/api/register/browser.js"
   },

packages/babel-cli/bin/babel/index.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+require("babel-core");
+
 var moduleFormatters = require("babel-core/lib/babel/transformation/modules");
 var pathExists       = require("path-exists");
 var commander        = require("commander");

packages/babel-cli/package.json

@@ -1,14 +1,14 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.6.7",
+  "version": "5.6.9",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
-    "babel-core": "^5.6.7",
+    "babel-core": "^5.6.9",
     "chokidar": "^1.0.0",
     "commander": "^2.6.0",
     "convert-source-map": "^1.1.0",
@@ -27,4 +27,4 @@
     "babel-external-helpers": "./bin/babel-external-helpers",
     "babel-plugin": "./bin/babel-plugin/index.js"
   }
-}
+}

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.6.7",
+  "version": "5.6.9",
   "license": "MIT",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",

src/acorn/src/expression.js

@@ -432,9 +432,18 @@ pp.parseParenAndDistinguishExpression = function(start, isAsync, canBeArrow) {
     }
 
     let innerStart = this.markPosition(), exprList = [], first = true
-    let refShorthandDefaultPos = {start: 0}, spreadStart, innerParenStart
+    let refShorthandDefaultPos = {start: 0}, spreadStart, innerParenStart, optionalCommaStart
     while (this.type !== tt.parenR) {
-      first ? first = false : this.expect(tt.comma)
+      if (first) {
+        first = false;
+      } else {
+        this.expect(tt.comma)
+        if (this.type === tt.parenR && this.options.features["es7.trailingFunctionCommas"]) {
+          optionalCommaStart = this.start
+          break
+        }
+      }
+
       if (this.type === tt.ellipsis) {
         let spreadNodeStart = this.markPosition()
         spreadStart = this.start
@@ -462,6 +471,7 @@ pp.parseParenAndDistinguishExpression = function(start, isAsync, canBeArrow) {
         this.unexpected(this.lastTokStart)
       }
     }
+    if (optionalCommaStart) this.unexpected(optionalCommaStart)
     if (spreadStart) this.unexpected(spreadStart)
     if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start)
 

test/acorn/tests-babel.js

@@ -3374,6 +3374,49 @@ test("class Foo { bar(a,) { } }", {
   features: { "es7.trailingFunctionCommas": true }
 });
 
+test("(x, y, ) => 1;", {
+  start: 0,
+  body: [{
+    start: 0,
+    expression: {
+      start: 0,
+      id: null,
+      generator: false,
+      expression: true,
+      params: [
+        {
+          start: 1,
+          name: "x",
+          type: "Identifier",
+          end: 2
+        },
+        {
+          start: 4,
+          name: "y",
+          type: "Identifier",
+          end: 5
+        }
+      ],
+      body: {
+        start: 12,
+        value: 1,
+        raw: "1",
+        type: "Literal",
+        end: 13
+      },
+      type: "ArrowFunctionExpression",
+      end: 13
+    },
+    type: "ExpressionStatement",
+    end: 14
+  }],
+  type: "Program",
+  end: 14
+}, {
+  ecmaVersion: 7,
+  features: { "es7.trailingFunctionCommas": true }
+});
+
 testFail("log(,);", "Unexpected token (1:4)", {
   ecmaVersion: 7,
   features: { "es7.trailingFunctionCommas": true }
@@ -3383,3 +3426,8 @@ testFail("function log(,) { }", "Unexpected token (1:13)", {
   ecmaVersion: 7,
   features: { "es7.trailingFunctionCommas": true }
 });
+
+testFail("('foo',)", "Unexpected token (1:7)", {
+  ecmaVersion: 7,
+  features: { "es7.trailingFunctionCommas": true }
+});

test/core/fixtures/transformation/es7.trailing-function-commas/arrow-function/actual.js

@@ -0,0 +1 @@
+(x, y, ) => {};

test/core/fixtures/transformation/es7.trailing-function-commas/arrow-function/expected.js

@@ -0,0 +1,3 @@
+"use strict";
+
+(function (x, y) {});