v4.7.1

CHANGELOG.md

@@ -13,6 +13,20 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 4.7.0
+
+ * **Bug Fix**
+  * Add `alternate` to list of `STATEMENT_OR_BLOCK` keys.
+  * Add support for module specifiers to `t.isReferenced`.
+ * **New Feature**
+  * Add `inputSourceMap` option.
+ * **Polish**
+  * Throw an error on different `babel` and `babel-runtime` versions.
+  * Replicate module environment for `babel-node` eval.
+  * Clean up classes output.
+ * **Spec Compliancy**
+  * Make it illegal to use a rest parameter on a setter.
+
 ## 4.6.6
 
  * **Bug Fix**

bin/babel/file.js

@@ -1,10 +1,10 @@
-var sourceMapToComment = require("source-map-to-comment");
-var sourceMap          = require("source-map");
-var chokidar           = require("chokidar");
-var path               = require("path");
-var util               = require("./util");
-var fs                 = require("fs");
-var _                  = require("lodash");
+var convertSourceMap = require("convert-source-map");
+var sourceMap        = require("source-map");
+var chokidar         = require("chokidar");
+var path             = require("path");
+var util             = require("./util");
+var fs               = require("fs");
+var _                = require("lodash");
 
 module.exports = function (commander, filenames) {
   var results = [];
@@ -42,7 +42,7 @@ module.exports = function (commander, filenames) {
     });
 
     if (commander.sourceMapsInline || (!commander.outFile && commander.sourceMaps)) {
-      code += "\n" + sourceMapToComment(map);
+      code += "\n" + convertSourceMap.fromObject(map).toComment();
     }
 
     return {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "4.6.6",
+  "version": "4.7.0",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
 }

src/babel/transformation/file.js

@@ -285,7 +285,7 @@ export default class File {
 
     var inputMap = convertSourceMap.fromSource(code);
     if (inputMap) {
-      opts.inputSourceMap = inputMap;
+      opts.inputSourceMap = inputMap.toObject();
       code = convertSourceMap.removeComments(code);
     }
 
@@ -479,14 +479,16 @@ export default class File {
     var inputMap = opts.inputSourceMap;
 
     if (inputMap) {
+      map.sources[0] = inputMap.file;
+
       var inputMapConsumer = new sourceMap.SourceMapConsumer(inputMap);
       var outputMapConsumer = new sourceMap.SourceMapConsumer(map);
       var outputMapGenerator = sourceMap.SourceMapGenerator.fromSourceMap(outputMapConsumer);
       outputMapGenerator.applySourceMap(inputMapConsumer);
 
       var mergedMap = outputMapGenerator.toJSON();
-      mergedMap.sources = map.sources
-      mergedMap.file = map.file;
+      mergedMap.sources = inputMap.sources
+      mergedMap.file = inputMap.file;
       return mergedMap;
     }